summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorkent <kent@pkgsrc.org>2002-08-21 12:42:44 +0000
committerkent <kent@pkgsrc.org>2002-08-21 12:42:44 +0000
commite49eb5d56bf089279ca4bd287e54c0842adfd926 (patch)
tree97134aa5778b2343824982841f33505711096199 /cross
parentd9f15a7f036b851ded09cb88509311937133bda6 (diff)
downloadpkgsrc-e49eb5d56bf089279ca4bd287e54c0842adfd926.tar.gz
Sync with PEACE repositry
http://cvs.kshosen.ac.jp/cvsweb.cgi/peace/pkgsrc/cross/i386-netbsdpe/ - Update binutils to 2.13 - Remove f77/objcc stuff
Diffstat (limited to 'cross')
-rw-r--r--cross/i386-netbsdpe/Makefile52
-rw-r--r--cross/i386-netbsdpe/PLIST4
-rw-r--r--cross/i386-netbsdpe/distinfo6
-rw-r--r--cross/i386-netbsdpe/files/PLIST-gcc-f778
-rw-r--r--cross/i386-netbsdpe/files/PLIST-gcc-f77-runtime3
-rw-r--r--cross/i386-netbsdpe/files/PLIST-gcc-objc2
-rw-r--r--cross/i386-netbsdpe/files/PLIST-gcc-objc-runtime13
-rw-r--r--cross/i386-netbsdpe/files/cross.mk128
-rw-r--r--cross/i386-netbsdpe/patches/binutils-aa15
-rw-r--r--cross/i386-netbsdpe/patches/binutils-ab12
-rw-r--r--cross/i386-netbsdpe/patches/binutils-ac14
-rw-r--r--cross/i386-netbsdpe/patches/binutils-ae17
-rw-r--r--cross/i386-netbsdpe/patches/binutils-af11
13 files changed, 90 insertions, 195 deletions
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index a7a0fe1cc55..0e1ce854583 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2002/03/18 03:04:40 kent Exp $
-# $PEACE: Makefile,v 1.18 2001/12/05 07:13:57 kent Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/21 12:42:44 kent Exp $
+# $PEACE: Makefile,v 1.21 2002/08/21 02:48:23 kent Exp $
-DISTVERSION= 1.3.0
+DISTVERSION= 1.3.4
CROSS_DISTFILES= # none
MAINTAINER= peace-sacrifice@hauN.org
HOMEPAGE= http://chiharu.hauN.org/peace/
COMMENT= Cross-compile environment for PEACE/i386
+# Need NetBSD headers in /usr/include
+ONLY_FOR_PLATFORM= NetBSD-*-*
-WRKSRC= ${WRKDIR}/${GCC_DISTNAME}
+WRKSRC= ${WRKDIR}/toolchain
USE_CROSS_BINUTILS= yes
BINUTILS_GNUTARGET= pe-i386
@@ -16,55 +18,50 @@ BINUTILS_LDEMULATION= i386pe
USE_CROSS_GCC= yes
GCC_FAKE_RUNTIME= yes
GCC_CXX= yes
-#GCC_F77= yes
-#GCC_OBJC= yes
#GCC_CXX_RUNTIME= yes
-#GCC_F77_RUNTIME= yes
-#GCC_OBJC_RUNTIME= yes
TARGET_ARCH= i386-netbsdpe
GCC_CONFIGURE_ARGS+= --enable-threads
-BINUTILS_EXTRAS= dlltool windres
+BINUTILS_EXTRAS= dlltool dllwrap windres
# Mingw pathes
GCC_WIN32_PATCHBUNDLE= ${GCC_DISTNAME}-x86-win32-patches.tar.gz
GCC_WIN32_PATCH= ${WRKDIR}/${GCC_DISTNAME}-patches/${GCC_DISTNAME}-x86-win32.diff
MASTER_SITES+= ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/${GCC_DISTNAME}/patches/
-CROSS_DISTFILES+= ${GCC_WIN32_PATCHBUNDLE}
+DISTFILES+= ${GCC_WIN32_PATCHBUNDLE}
# SSP patch
MASTER_SITES+= http://www.trl.ibm.com/projects/security/ssp/gcc2_95_2/
SSP_PATCH= protector-2.95.2-2.tar.gz
-CROSS_DISTFILES+= ${SSP_PATCH}
+DISTFILES+= ${SSP_PATCH}
# pthread
PTHREAD_DISTNAME= unproven-pthreads-0.17
PTHREAD_DISTFILE= ${PTHREAD_DISTNAME}.tar.gz
MASTER_SITES+= ftp://ftp.flame.org/pub/netbsd/
-CROSS_DISTFILES+= ${PTHREAD_DISTFILE}
+DISTFILES+= ${PTHREAD_DISTFILE}
-pre-patch: gcc-patchbundle
+EXTRACT_ONLY= ${GCC_WIN32_PATCHBUNDLE} ${SSP_PATCH} ${PTHREAD_DISTFILE}
-gcc-patchbundle:
- cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${GCC_WIN32_PATCHBUNDLE}
- ${PATCH} -d ${WRKDIR} --forward --quiet -E < ${GCC_WIN32_PATCH}
+post-extract:
+ cd ${WRKDIR} && ${PAX} -rz -s /${GCC_DISTNAME}/toolchain/ \
+ -f ${_DISTDIR}/${GCC_DISTNAME}.tar.gz
+ ${PATCH} -d ${WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
+ cd ${WRKDIR} && ${PAX} -rz -s /${BINUTILS_DISTNAME}/toolchain/ \
+ -f ${_DISTDIR}/${BINUTILS_DISTNAME}.tar.bz2
post-patch:
for i in patches/binutils-*; do \
- ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
+ ${PATCH} -d ${WRKSRC} --forward --quiet -E < $$i; \
done
- cd ${BINUTILS_WRKSRC}/bfd && ${LOCALBASE}/bin/autoconf
- cd ${BINUTILS_WRKSRC}/gas && ${LOCALBASE}/bin/autoconf
- cd ${WRKDIR}/${GCC_DISTNAME}/gcc && ${LOCALBASE}/bin/autoconf
- cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${PTHREAD_DISTFILE}
- cd ${WRKDIR}/${GCC_DISTNAME}/gcc && \
+ cd ${WRKSRC}/gcc && ${LOCALBASE}/bin/autoconf
+ cd ${WRKSRC}/gcc && \
${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread.h . && \
${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread .
- cd ${WRKDIR} && /usr/bin/tar zxf ${_DISTDIR}/${SSP_PATCH}
- ${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKDIR}/${GCC_DISTNAME}/gcc/
- ${PATCH} -d ${WRKDIR}/${GCC_DISTNAME} --forward --quiet -E < ${WRKDIR}/protector.dif
-# ${PATCH} -d ${WRKDIR}/${GCC_DISTNAME} --forward --quiet -E < ${WRKDIR}/protectonly.dif
+ ${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKSRC}/gcc/
+ ${PATCH} -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protector.dif
+# ${PATCH} -d ${WRKSRC} --forward --quiet -E < ${WRKDIR}/protectonly.dif
CFLAGS_FOR_TARGET+= -I${WRKDIR}
post-configure:
@@ -72,8 +69,7 @@ post-configure:
${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
+ ${SED} "s/^extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > ${WRKDIR}/stdio.h
#.include "../COMMON/cross.mk"
.include "files/cross.mk"
diff --git a/cross/i386-netbsdpe/PLIST b/cross/i386-netbsdpe/PLIST
index bd46c8deeae..d4c480b769e 100644
--- a/cross/i386-netbsdpe/PLIST
+++ b/cross/i386-netbsdpe/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/21 12:42:44 kent Exp $
bin/${TARGET_ARCH}-dlltool
+bin/${TARGET_ARCH}-dllwrap
bin/${TARGET_ARCH}-windres
${TARGET_ARCH}/bin/dlltool
+${TARGET_ARCH}/bin/dllwrap
${TARGET_ARCH}/bin/windres
diff --git a/cross/i386-netbsdpe/distinfo b/cross/i386-netbsdpe/distinfo
index 37e88803b5a..70e7573d3e1 100644
--- a/cross/i386-netbsdpe/distinfo
+++ b/cross/i386-netbsdpe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/03/18 03:04:40 kent Exp $
+$NetBSD: distinfo,v 1.5 2002/08/21 12:42:44 kent Exp $
SHA1 (gcc-2.95.2-x86-win32-patches.tar.gz) = 8018d7a1c32211fc7a2f413cd49c422f7ccfd2ec
Size (gcc-2.95.2-x86-win32-patches.tar.gz) = 217965 bytes
@@ -6,8 +6,8 @@ SHA1 (protector-2.95.2-2.tar.gz) = 7b906b45e4e08e414ec8bca611d5371d82994401
Size (protector-2.95.2-2.tar.gz) = 17034 bytes
SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
-SHA1 (binutils-2.11.92-20011113-src.tar.gz) = 3286f3f239fa3e3565225ca6d3a875dbecfbc542
-Size (binutils-2.11.92-20011113-src.tar.gz) = 10310634 bytes
+SHA1 (binutils-2.13.tar.bz2) = 5d6aa1f4f97da617d1c7f99c8f2ceee146eb5369
+Size (binutils-2.13.tar.bz2) = 9882367 bytes
SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
Size (gcc-2.95.2.tar.gz) = 12885815 bytes
SHA1 (patch-aa) = cd270eb18e0b65641a416c1215388dc9fb91f33d
diff --git a/cross/i386-netbsdpe/files/PLIST-gcc-f77 b/cross/i386-netbsdpe/files/PLIST-gcc-f77
deleted file mode 100644
index a7fc4d236e5..00000000000
--- a/cross/i386-netbsdpe/files/PLIST-gcc-f77
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST-gcc-f77,v 1.1 2001/01/30 03:08:57 minoura Exp $
-${TARGET_ARCH}/bin/f77
-${TARGET_ARCH}/bin/fort77
-${TARGET_ARCH}/bin/g77
-bin/${TARGET_ARCH}-f77
-bin/${TARGET_ARCH}-fort77
-bin/${TARGET_ARCH}-g77
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/f771
diff --git a/cross/i386-netbsdpe/files/PLIST-gcc-f77-runtime b/cross/i386-netbsdpe/files/PLIST-gcc-f77-runtime
deleted file mode 100644
index 9e7886c1c34..00000000000
--- a/cross/i386-netbsdpe/files/PLIST-gcc-f77-runtime
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST-gcc-f77-runtime,v 1.1 2001/01/30 03:08:57 minoura Exp $
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/g2c.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/libg2c.a
diff --git a/cross/i386-netbsdpe/files/PLIST-gcc-objc b/cross/i386-netbsdpe/files/PLIST-gcc-objc
deleted file mode 100644
index d5fcb3ec095..00000000000
--- a/cross/i386-netbsdpe/files/PLIST-gcc-objc
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST-gcc-objc,v 1.1 2001/01/30 03:11:28 minoura Exp $
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/cc1obj
diff --git a/cross/i386-netbsdpe/files/PLIST-gcc-objc-runtime b/cross/i386-netbsdpe/files/PLIST-gcc-objc-runtime
deleted file mode 100644
index a793d97b72e..00000000000
--- a/cross/i386-netbsdpe/files/PLIST-gcc-objc-runtime
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST-gcc-objc-runtime,v 1.1 2001/01/30 03:08:58 minoura Exp $
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/NXConstStr.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/Object.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/Protocol.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/encoding.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/hash.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/objc-api.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/objc-list.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/objc.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/sarray.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/thr.h
-lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc/typedstream.h
-@dirrm lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include/objc
diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk
index e3c282773d9..3f8c143b357 100644
--- a/cross/i386-netbsdpe/files/cross.mk
+++ b/cross/i386-netbsdpe/files/cross.mk
@@ -1,5 +1,5 @@
-# $NetBSD: cross.mk,v 1.10 2002/03/20 13:22:12 kent Exp $
-# $PEACE: cross.mk,v 1.9 2002/03/18 01:18:11 kent Exp $
+# $NetBSD: cross.mk,v 1.11 2002/08/21 12:42:45 kent Exp $
+# $PEACE: cross.mk,v 1.12 2002/08/21 02:48:24 kent Exp $
# based on pkgsrc/cross/COMMON/cross.mk
# NetBSD: cross.mk,v 1.16 2000/11/09 13:04:55 wiz Exp
@@ -30,46 +30,29 @@ pre-install-dirs:
${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
.if defined(USE_CROSS_BINUTILS)
-BINUTILS_DISTNAME= binutils-2.11.92-20011113-src
-#BINUTILS_WRKSRC= ${WRKDIR}/${BINUTILS_DISTNAME}
-BINUTILS_WRKSRC= ${WRKDIR}/binutils-2.11.92-20011113
-
-CROSS_DISTFILES+= ${BINUTILS_DISTNAME}.tar.gz
-#MASTER_SITES+= ${MASTER_SITE_GNU:=binutils/}
-MASTER_SITES+= http://prdownloads.sourceforge.net/mingw/
-CONFIGURE_ARGS+= --with-gnu-as --with-gnu-ld --disable-nls
-#DEPENDS+= cross-binutils>=2.9.1.1:../../cross/binutils
+BINUTILS_DISTNAME= binutils-2.13
+DISTFILES+= ${BINUTILS_DISTNAME}.tar.bz2
+SITES_binutils-020711.tar.bz2= ftp://ftp.netbsd.org/pub/NetBSD/misc/kent/
+MASTER_SITES+= ${MASTER_SITE_GNU:=binutils/}
+#MASTER_SITES+= http://prdownloads.sourceforge.net/mingw/
+CONFIGURE_ARGS+= --with-gnu-as --with-gnu-ld --data-dir=${TARGET_DIR}/share
PLIST_PRE+= ${COMMON_DIR}/PLIST-binutils
-AS_FOR_TARGET= ${BINUTILS_WRKSRC}/gas/as-new
-AR_FOR_TARGET= ${BINUTILS_WRKSRC}/binutils/ar
-NM_FOR_TARGET= ${BINUTILS_WRKSRC}/binutils/nm-new
-RANLIB_FOR_TARGET= ${BINUTILS_WRKSRC}/binutils/ranlib
-LD_FOR_TARGET= ${BINUTILS_WRKSRC}/ld/ld-new
+AS_FOR_TARGET= ${WRKOBJ}/gas/as-new
+AR_FOR_TARGET= ${WRKOBJ}/binutils/ar
+NM_FOR_TARGET= ${WRKOBJ}/binutils/nm-new
+RANLIB_FOR_TARGET= ${WRKOBJ}/binutils/ranlib
+LD_FOR_TARGET= ${WRKOBJ}/ld/ld-new
-pre-configure: binutils-configure
-do-build: binutils-build
do-install: binutils-install
-BFD64ARG= --enable-64-bit-bfd
-
-binutils-configure:
- @cd ${BINUTILS_WRKSRC} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
- CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} ./configure \
- --prefix=${PREFIX} --host=${MACHINE_GNU_ARCH}--netbsd \
- --target=${TARGET_ARCH} --disable-nls ${BFD64ARG}
-
-binutils-build:
- @cd ${BINUTILS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS}
-
binutils-install:
- ${INSTALL_PROGRAM} ${BINUTILS_WRKSRC}/gas/as-new ${TARGET_DIR}/bin/as
- ${INSTALL_PROGRAM} ${BINUTILS_WRKSRC}/ld/ld-new ${TARGET_DIR}/bin/ld
- ${INSTALL_PROGRAM} ${BINUTILS_WRKSRC}/binutils/nm-new ${TARGET_DIR}/bin/nm
- ${INSTALL_PROGRAM} ${BINUTILS_WRKSRC}/binutils/strip-new ${TARGET_DIR}/bin/strip
+ ${INSTALL_PROGRAM} ${WRKOBJ}/gas/as-new ${TARGET_DIR}/bin/as
+ ${INSTALL_PROGRAM} ${WRKOBJ}/ld/ld-new ${TARGET_DIR}/bin/ld
+ ${INSTALL_PROGRAM} ${WRKOBJ}/binutils/nm-new ${TARGET_DIR}/bin/nm
+ ${INSTALL_PROGRAM} ${WRKOBJ}/binutils/strip-new ${TARGET_DIR}/bin/strip
for i in addr2line ar objcopy objdump ranlib size strings ${BINUTILS_EXTRAS}; do \
- ${INSTALL_PROGRAM} ${BINUTILS_WRKSRC}/binutils/$$i ${TARGET_DIR}/bin/$$i; \
+ ${INSTALL_PROGRAM} ${WRKOBJ}/binutils/$$i ${TARGET_DIR}/bin/$$i; \
done
for i in addr2line ar as ld nm objcopy objdump ranlib size strings strip ${BINUTILS_EXTRAS}; do \
${LN} -f ${TARGET_DIR}/bin/$$i ${PREFIX}/bin/${TARGET_ARCH}-$$i; \
@@ -79,7 +62,7 @@ binutils-install:
.if defined(USE_CROSS_GCC)
GCC_DISTNAME= gcc-2.95.2
GCC_INTVERSION= 2.95.2
-GCC_WRKSRC= ${WRKDIR}/${GCC_DISTNAME}
+MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/}
GCC_LANGUAGES= c # add to these below
BUILD_DEPENDS+= autoconf-*:../../devel/autoconf
@@ -92,28 +75,12 @@ PLIST_PRE+= ${GCC_PLIST_DIR}/PLIST-gcc-cxx-runtime
.endif
.endif
-.if defined(GCC_F77)
-GCC_LANGUAGES+= f77
-PLIST_PRE+= ${GCC_PLIST_DIR}/PLIST-gcc-f77
-.if defined(GCC_F77_RUNTIME)
-PLIST_PRE+= ${GCC_PLIST_DIR}/PLIST-gcc-f77-runtime
-.endif
-.endif
-
-.if defined(GCC_OBJC)
-GCC_LANGUAGES+= objc
-PLIST_PRE+= ${GCC_PLIST_DIR}/PLIST-gcc-objc
-.if defined(GCC_OBJC_RUNTIME)
-PLIST_PRE+= ${GCC_PLIST_DIR}/PLIST-gcc-objc-runtime
-.endif
-.endif
-
# the main PLIST needs to go last to get the @dirrm's right
PLIST_PRE+= ${GCC_PLIST_DIR}/PLIST-gcc
-CROSS_DISTFILES+= ${GCC_DISTNAME}.tar.gz #${EGCS_PATCHBUNDLE}
+DISTFILES+= ${GCC_DISTNAME}.tar.gz
USE_GMAKE= yes
-CC_FOR_TARGET= ${GCC_WRKSRC}/gcc/xgcc -B${GCC_WRKSRC}/gcc/ ${CFLAGS_FOR_TARGET}
+CC_FOR_TARGET= ${WRKOBJ}/gcc/xgcc -B${WRKOBJ}/gcc/ ${CFLAGS_FOR_TARGET}
CXX_FOR_TARGET= ${CC_FOR_TARGET}
GCC_MAKE_FLAGS= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
@@ -142,24 +109,18 @@ GCC_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${CROSS_SYS_INCLUDE}"
LDFLAGS_FOR_TARGET+= -L${SYS_LIB}
.endif
-#pre-patch: gcc-patch
pre-configure: gcc-configure
do-build: gcc-build
do-install: gcc-install
-#gcc-patch:
-# @${GZCAT} ${_DISTDIR}/${EGCS_PATCHBUNDLE} | \
-# ${PATCH} -d ${EGCS_WRKSRC} --forward --quiet -E
-# @for i in ${COMMON_DIR}/patches-egcs/patch-*; do \
-# ${PATCH} -d ${EGCS_WRKSRC} --forward --quiet -E < $$i; \
-# done
-
+WRKOBJ= ${WRKDIR}/obj
gcc-configure:
- @cd ${GCC_WRKSRC} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
+ @-mkdir ${WRKOBJ}
+ @cd ${WRKOBJ} && ${SETENV} CC="${CC}" ac_cv_path_CC="${CC}" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- ./configure --prefix=${PREFIX} \
+ ${WRKSRC}/configure --prefix=${PREFIX} \
--host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \
${GCC_CONFIGURE_ARGS} ${CXX_CONFIGURE_ARGS}
.if defined(GCC_FAKE_RUNTIME)
@@ -169,46 +130,29 @@ gcc-configure:
.endif
gcc-build:
- @${LN} -sf ${AS_FOR_TARGET} ${GCC_WRKSRC}/gcc/as
- @${LN} -sf ${LD_FOR_TARGET} ${GCC_WRKSRC}/gcc/ld
- @cd ${GCC_WRKSRC} && make all-libiberty
- @cd ${GCC_WRKSRC}/gcc && ${GCC_MAKE} all
+ @cd ${WRKOBJ} && make all-libiberty all-binutils all-gas all-ld
+ @cd ${WRKOBJ}/gcc && ${GCC_MAKE} all
.if defined(GCC_CXX) && defined(GCC_CXX_RUNTIME)
- @cd ${GCC_WRKSRC} && ${GCC_MAKE} configure-target-libio configure-target-libstdc++ all-target-libio all-target-libstdc++
-.endif
-.if defined(GCC_F77) && defined(GCC_F77_RUNTIME)
- @cd ${GCC_WRKSRC} && ${GCC_MAKE} configure-target-libf2c all-target-libf2c
-.endif
-.if defined(GCC_OBJC) && defined(GCC_OBJC_RUNTIME)
- @cd ${GCC_WRKSRC}/gcc && ${GCC_MAKE} objc-runtime
+ @cd ${WRKOBJ} && ${GCC_MAKE} configure-target-libio \
+ configure-target-libstdc++ all-target-libio all-target-libstdc++
.endif
gcc-install:
- @cd ${GCC_WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} \
+ @cd ${WRKOBJ}/gcc && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} \
install-common install-headers install-libgcc install-driver
${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}
${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${PREFIX}/bin/${TARGET_ARCH}-cc
${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${TARGET_DIR}/bin/cc
${RM} ${PREFIX}/bin/${TARGET_ARCH}-gcj # install-driver installs gcj but we need not it
-.if defined(GCC_F77)
-.if defined(GCC_F77_RUNTIME)
- @cd ${GCC_WRKSRC} && ${GCC_MAKE} install-target-libf2c
-.endif
- ${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-f77
- ${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-fort77
- for file in f77 fort77 g77; do \
- ${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
- done
-.endif
.if defined(GCC_CXX)
@${MKDIR} ${TARGET_DIR}/include/c++
@for file in exception new new.h typeinfo; do \
- ${INSTALL_DATA} ${GCC_WRKSRC}/gcc/cp/inc/$$file ${TARGET_DIR}/include/c++; \
+ ${INSTALL_DATA} ${WRKSRC}/gcc/cp/inc/$$file ${TARGET_DIR}/include/c++; \
done
.if defined(GCC_CXX_RUNTIME)
@${MKDIR} ${TARGET_DIR}/include/g++/std
- @cd ${GCC_WRKSRC} && ${GCC_MAKE} install-target-libstdc++
+ @cd ${WRKSRC} && ${GCC_MAKE} install-target-libstdc++
.endif
for file in c++ c++filt g++; do \
${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
@@ -218,14 +162,6 @@ gcc-install:
@${RMDIR} -p ${PREFIX}/man/man1 2>/dev/null || ${TRUE}
.endif
-.if defined(CROSS_DISTFILES)
-DISTFILES+= ${CROSS_DISTFILES}
-.if defined(EXTRACT_ONLY)
-EXTRACT_ONLY+= ${CROSS_DISTFILES:N*.diff.gz}
-.else
-EXTRACT_ONLY= ${DISTFILES:N*.diff.gz}
-.endif
-.endif
.if defined(CROSS_SYS_INCLUDE) && !defined(GCC_FAKE_RUNTIME)
pre-install: pre-install-includes
diff --git a/cross/i386-netbsdpe/patches/binutils-aa b/cross/i386-netbsdpe/patches/binutils-aa
deleted file mode 100644
index 69bc170687d..00000000000
--- a/cross/i386-netbsdpe/patches/binutils-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: binutils-aa,v 1.2 2001/10/21 12:24:16 kent Exp $
-
---- bfd/config.bfd.dist Thu Jun 14 20:16:59 2001
-+++ bfd/config.bfd
-@@ -351,6 +351,10 @@
- targ_defvec=bfd_elf32_i386_vec
- targ_selvecs=i386netbsd_vec
- ;;
-+ i[3456]86-*-netbsdpe*)
-+ targ_defvec=i386pe_vec
-+ targ_selvecs="i386pe_vec i386pei_vec"
-+ ;;
- i[3456]86-*-netbsdaout* | i[3456]86-*-netbsd* | i[3456]86-*-openbsd*)
- targ_defvec=i386netbsd_vec
- targ_selvecs="bfd_elf32_i386_vec i386bsd_vec"
diff --git a/cross/i386-netbsdpe/patches/binutils-ab b/cross/i386-netbsdpe/patches/binutils-ab
deleted file mode 100644
index 763c3ef51f2..00000000000
--- a/cross/i386-netbsdpe/patches/binutils-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: binutils-ab,v 1.3 2002/03/18 03:04:41 kent Exp $
-
---- gas/configure.in.dist Wed Dec 5 15:26:27 2001
-+++ gas/configure.in
-@@ -246,6 +246,7 @@
- i386-*-bsd*) fmt=aout em=386bsd ;;
- i386-*-netbsd0.8) fmt=aout em=386bsd ;;
- i386-*-netbsdelf*) fmt=elf em=nbsd bfd_gas=yes ;;
-+ i386-*-netbsdpe*) fmt=coff em=pe bfd_gas=yes ;;
- i386-*-netbsd*) fmt=aout em=nbsd bfd_gas=yes;;
- i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes;;
- i386-*-linux*aout* | i386-*-linux*oldld) fmt=aout em=linux ;;
diff --git a/cross/i386-netbsdpe/patches/binutils-ac b/cross/i386-netbsdpe/patches/binutils-ac
deleted file mode 100644
index b5debf351f0..00000000000
--- a/cross/i386-netbsdpe/patches/binutils-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: binutils-ac,v 1.2 2002/03/18 03:04:41 kent Exp $
-
---- ld/configure.tgt.orig Wed Dec 5 15:47:58 2001
-+++ ld/configure.tgt
-@@ -154,6 +154,9 @@
- i[3456]86-*-netbsdelf*) targ_emul=elf_i386
- targ_extra_emuls=i386nbsd
- ;;
-+i[3456]86-*-netbsdpe*) targ_emul=i386pe ;
-+ targ_extra_ofiles="deffilep.o pe-dll.o"
-+ ;;
- i[3456]86-*-netbsd*) targ_emul=i386nbsd
- targ_extra_emuls=elf_i386
- ;;
diff --git a/cross/i386-netbsdpe/patches/binutils-ae b/cross/i386-netbsdpe/patches/binutils-ae
new file mode 100644
index 00000000000..c3461754951
--- /dev/null
+++ b/cross/i386-netbsdpe/patches/binutils-ae
@@ -0,0 +1,17 @@
+$NetBSD: binutils-ae,v 1.1 2002/08/21 12:42:46 kent Exp $
+
+--- ld/ldmain.c.orig Mon Jul 1 17:07:29 2002
++++ ld/ldmain.c
+@@ -439,8 +439,12 @@
+ }
+ else
+ {
++#if 0
+ if (! bfd_close (output_bfd))
+ einfo (_("%F%B: final close failed: %E\n"), output_bfd);
++#else
++ bfd_close (output_bfd);
++#endif
+
+ /* If the --force-exe-suffix is enabled, and we're making an
+ executable file and it doesn't end in .exe, copy it to one
diff --git a/cross/i386-netbsdpe/patches/binutils-af b/cross/i386-netbsdpe/patches/binutils-af
new file mode 100644
index 00000000000..9774e9d4545
--- /dev/null
+++ b/cross/i386-netbsdpe/patches/binutils-af
@@ -0,0 +1,11 @@
+--- binutils/dlltool.c.orig Tue May 21 03:23:05 2002
++++ binutils/dlltool.c Mon Jul 15 18:55:11 2002
+@@ -1355,6 +1355,8 @@
+ for (excl_item = excludes; excl_item; excl_item = excl_item->next)
+ if (strcmp (string, excl_item->string) == 0)
+ return true;
++ if (string[0] != '_')
++ return true;
+ return false;
+ }
+