From ca4987141693be9c4fbcda9352fa2fbb9f96fc65 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 10 Mar 2001 21:15:26 +0000 Subject: Purely automatic replacement: SYS_INCLUDE -> CROSS_SYS_INCLUDE. Fixes pkg/7006. --- cross/COMMON/cross.mk | 19 ++++++++++--------- cross/i386-cygwin32/Makefile | 10 +++++----- cross/i386-linux/Makefile | 10 +++++----- cross/i386-linuxglibc1/Makefile | 4 ++-- cross/i386-msdosdjgpp/Makefile | 6 +++--- cross/i386-netbsdpe/Makefile | 10 +++++----- cross/i386-netbsdpe/files/cross.mk | 19 ++++++++++--------- 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk index f9fe47f9e57..945e50cdcee 100644 --- a/cross/COMMON/cross.mk +++ b/cross/COMMON/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.20 2001/02/05 09:00:54 tron Exp $ +# $NetBSD: cross.mk,v 1.21 2001/03/10 21:15:26 wiz Exp $ # Shared definitions for building a cross-compile environment. @@ -163,11 +163,11 @@ EGCS_MAKE= ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} .if defined(EGCS_FAKE_RUNTIME) -SYS_INCLUDE= ${WRKDIR}/include +CROSS_SYS_INCLUDE= ${WRKDIR}/include .endif -.if defined(SYS_INCLUDE) -CFLAGS_FOR_TARGET+= -idirafter ${SYS_INCLUDE} -EGCS_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${SYS_INCLUDE}" +.if defined(CROSS_SYS_INCLUDE) +CFLAGS_FOR_TARGET+= -idirafter ${CROSS_SYS_INCLUDE} +EGCS_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${CROSS_SYS_INCLUDE}" .endif .if defined(SYS_LIB) LDFLAGS_FOR_TARGET+= -L${SYS_LIB} @@ -194,8 +194,9 @@ egcs-configure: --host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \ ${CXX_CONFIGURE_ARGS} .if defined(EGCS_FAKE_RUNTIME) - @${MKDIR} ${SYS_INCLUDE} ${SYS_INCLUDE}/machine ${SYS_INCLUDE}/sys - @cd ${SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \ + @${MKDIR} ${CROSS_SYS_INCLUDE} ${CROSS_SYS_INCLUDE}/machine \ + ${CROSS_SYS_INCLUDE}/sys + @cd ${CROSS_SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \ sys/time.h stdlib.h unistd.h .endif @@ -252,10 +253,10 @@ EXTRACT_ONLY= ${DISTFILES:N*.diff.gz} .endif .endif -.if defined(SYS_INCLUDE) && !defined(EGCS_FAKE_RUNTIME) +.if defined(CROSS_SYS_INCLUDE) && !defined(EGCS_FAKE_RUNTIME) pre-install: pre-install-includes pre-install-includes: - cd ${SYS_INCLUDE} && ${PAX} -rw . ${TARGET_DIR}/include + cd ${CROSS_SYS_INCLUDE} && ${PAX} -rw . ${TARGET_DIR}/include .endif .if defined(SYS_LIB) diff --git a/cross/i386-cygwin32/Makefile b/cross/i386-cygwin32/Makefile index ac53f7294df..2f125c3166d 100644 --- a/cross/i386-cygwin32/Makefile +++ b/cross/i386-cygwin32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 14:04:56 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/10 21:15:27 wiz Exp $ # DISTVERSION= 1.0.0.0 @@ -27,9 +27,9 @@ BINUTILS_EXTRAS= dlltool windres ## Actually we have to install Cygwin headers and libraries with this package; ## the header files from NetBSD should be deleted at that time. post-configure: - ${CP} ${FILESDIR}/i386_limits.h ${SYS_INCLUDE}/machine/limits.h - ${CP} ${FILESDIR}/syslimits.h ${SYS_INCLUDE}/sys/ - ${CP} ${FILESDIR}/featuretest.h ${SYS_INCLUDE}/sys/ - ${CP} ${FILESDIR}/limits.h ${SYS_INCLUDE}/ + ${CP} ${FILESDIR}/i386_limits.h ${CROSS_SYS_INCLUDE}/machine/limits.h + ${CP} ${FILESDIR}/syslimits.h ${CROSS_SYS_INCLUDE}/sys/ + ${CP} ${FILESDIR}/featuretest.h ${CROSS_SYS_INCLUDE}/sys/ + ${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/ .include "../COMMON/cross.mk" diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile index 5061ad37aaf..0c4fc2a5c54 100644 --- a/cross/i386-linux/Makefile +++ b/cross/i386-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 14:04:56 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/10 21:15:27 wiz Exp $ # DISTVERSION= 2.0.7.1 @@ -25,7 +25,7 @@ LINUXDEVEL_FILES= glibc-2.0.7-13.i386.rpm \ kernel-headers-2.0.34-0.6.i386.rpm TARGET_ARCH= i386-linux -SYS_INCLUDE= ${WRKDIR}/usr/include +CROSS_SYS_INCLUDE= ${WRKDIR}/usr/include SYS_LIB= ${WRKDIR}/usr/lib LDFLAGS_FOR_TARGET= -Wl,-rpath-link=${SYS_LIB} @@ -36,10 +36,10 @@ post-extract: rpm2cpio ${_DISTDIR}/$$file | cpio -id; \ done @cd ${WRKDIR}/lib && ${MV} -f * ${SYS_LIB} - @cd ${SYS_INCLUDE} && ${RM} -f asm linux scsi + @cd ${CROSS_SYS_INCLUDE} && ${RM} -f asm linux scsi @cd ${WRKDIR}/usr/src/linux-2.0.34/include && \ - ${MV} -f asm-i386 ${SYS_INCLUDE}/asm && \ - ${MV} -f linux scsi ${SYS_INCLUDE} + ${MV} -f asm-i386 ${CROSS_SYS_INCLUDE}/asm && \ + ${MV} -f linux scsi ${CROSS_SYS_INCLUDE} @cd ${SYS_LIB}; \ for so in libBrokenLocale libcrypt libdb libdl libm libndbm \ libnsl libnss_compat libnss_db libnss_dns \ diff --git a/cross/i386-linuxglibc1/Makefile b/cross/i386-linuxglibc1/Makefile index ac6590601e4..97b6c44fa52 100644 --- a/cross/i386-linuxglibc1/Makefile +++ b/cross/i386-linuxglibc1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/23 12:29:06 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/10 21:15:27 wiz Exp $ # DISTVERSION= 5.3.12.1 @@ -22,7 +22,7 @@ LINUXDEVEL_FILES= libc-5.3.12-18.i386.rpm \ kernel-headers-2.0.30-2.i386.rpm TARGET_ARCH= i386-linuxglibc1 -SYS_INCLUDE= ${WRKDIR}/usr/include +CROSS_SYS_INCLUDE= ${WRKDIR}/usr/include SYS_LIB= ${WRKDIR}/usr/lib # Extract and rearrange Linux distribution files. diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile index 229bd9d6d53..957ca82f5cd 100644 --- a/cross/i386-msdosdjgpp/Makefile +++ b/cross/i386-msdosdjgpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 14:04:58 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/10 21:15:27 wiz Exp $ # DISTVERSION= 2.02.0 @@ -23,7 +23,7 @@ USE_CROSS_EGCS= yes DJGPP_FILES= djcrx202.zip wmemu2b.zip TARGET_ARCH= i386-msdosdjgpp -SYS_INCLUDE= ${WRKSRC}/include +CROSS_SYS_INCLUDE= ${WRKSRC}/include SYS_LIB= ${WRKSRC}/lib post-extract: @@ -40,7 +40,7 @@ post-extract: @${RM} -f ${SYS_LIB}/djgpp.djl ${SYS_LIB}/specs post-patch: - @${RM} -f ${SYS_INCLUDE}/sys/*.orig + @${RM} -f ${CROSS_SYS_INCLUDE}/sys/*.orig do-build: cd ${WRKSRC}/src/stub && ${LINK.c} -o stubedit stubedit.c diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile index 8af7b660530..aa7c6539d02 100644 --- a/cross/i386-netbsdpe/Makefile +++ b/cross/i386-netbsdpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/03/08 10:17:11 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/10 21:15:27 wiz Exp $ # DISTVERSION= 1.1.4 @@ -57,10 +57,10 @@ post-patch: CFLAGS_FOR_TARGET+= -I${WRKDIR} post-configure: - ${CP} ${FILESDIR}/i386_limits.h ${SYS_INCLUDE}/machine/limits.h - ${CP} ${FILESDIR}/syslimits.h ${SYS_INCLUDE}/sys/ - ${CP} ${FILESDIR}/featuretest.h ${SYS_INCLUDE}/sys/ - ${CP} ${FILESDIR}/limits.h ${SYS_INCLUDE}/ + ${CP} ${FILESDIR}/i386_limits.h ${CROSS_SYS_INCLUDE}/machine/limits.h + ${CP} ${FILESDIR}/syslimits.h ${CROSS_SYS_INCLUDE}/sys/ + ${CP} ${FILESDIR}/featuretest.h ${CROSS_SYS_INCLUDE}/sys/ + ${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/ ${RM} ${WRKDIR}/${GCC_DISTNAME}/texinfo/makeinfo/Makefile ${SED} "s/extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > ${WRKDIR}/stdio.h diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk index 1b26e1b2642..5ee654a7dd6 100644 --- a/cross/i386-netbsdpe/files/cross.mk +++ b/cross/i386-netbsdpe/files/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.5 2001/03/02 09:38:06 minoura Exp $ +# $NetBSD: cross.mk,v 1.6 2001/03/10 21:15:27 wiz Exp $ # $PEACE: cross.mk,v 1.1 2001/01/16 15:20:26 kent Exp $ # based on pkgsrc/cross/COMMON/cross.mk # NetBSD: cross.mk,v 1.16 2000/11/09 13:04:55 wiz Exp @@ -155,11 +155,11 @@ GCC_MAKE= ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} .if defined(GCC_FAKE_RUNTIME) -SYS_INCLUDE= ${WRKDIR}/include +CROSS_SYS_INCLUDE= ${WRKDIR}/include .endif -.if defined(SYS_INCLUDE) -CFLAGS_FOR_TARGET+= -idirafter ${SYS_INCLUDE} -GCC_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${SYS_INCLUDE}" +.if defined(CROSS_SYS_INCLUDE) +CFLAGS_FOR_TARGET+= -idirafter ${CROSS_SYS_INCLUDE} +GCC_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${CROSS_SYS_INCLUDE}" .endif .if defined(SYS_LIB) LDFLAGS_FOR_TARGET+= -L${SYS_LIB} @@ -186,8 +186,9 @@ gcc-configure: --host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \ ${GCC_CONFIGURE_ARGS} ${CXX_CONFIGURE_ARGS} .if defined(GCC_FAKE_RUNTIME) - @${MKDIR} ${SYS_INCLUDE} ${SYS_INCLUDE}/machine ${SYS_INCLUDE}/sys - @cd ${SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \ + @${MKDIR} ${CROSS_SYS_INCLUDE} ${CROSS_SYS_INCLUDE}/machine \ + ${CROSS_SYS_INCLUDE}/sys + @cd ${CROSS_SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \ sys/time.h stdlib.h unistd.h .endif @@ -250,10 +251,10 @@ EXTRACT_ONLY= ${DISTFILES:N*.diff.gz} .endif .endif -.if defined(SYS_INCLUDE) && !defined(GCC_FAKE_RUNTIME) +.if defined(CROSS_SYS_INCLUDE) && !defined(GCC_FAKE_RUNTIME) pre-install: pre-install-includes pre-install-includes: - cd ${SYS_INCLUDE} && ${PAX} -rw . ${TARGET_DIR}/include + cd ${CROSS_SYS_INCLUDE} && ${PAX} -rw . ${TARGET_DIR}/include .endif .if defined(SYS_LIB) -- cgit v1.2.3