pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/cross/i386-netbsdpe update based gcc and binutils.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c9521d354a5
branches:  trunk
changeset: 470436:5c9521d354a5
user:      kent <kent%pkgsrc.org@localhost>
date:      Tue Mar 09 12:19:12 2004 +0000

description:
update based gcc and binutils.
 - gcc 2.95.2 -> 3.3.3
 - binutils 030425 -> 2.15.90 (20040222)

diffstat:

 cross/i386-netbsdpe/Makefile                    |  129 ++-
 cross/i386-netbsdpe/PLIST                       |  114 +++-
 cross/i386-netbsdpe/distinfo                    |   33 +-
 cross/i386-netbsdpe/files/PLIST-gcc             |   49 -
 cross/i386-netbsdpe/files/PLIST-gcc-cxx         |   13 -
 cross/i386-netbsdpe/files/PLIST-gcc-cxx-runtime |  116 ---
 cross/i386-netbsdpe/files/cross.mk              |  200 ------
 cross/i386-netbsdpe/files/featuretest.h         |   21 -
 cross/i386-netbsdpe/files/i386_limits.h         |   98 ---
 cross/i386-netbsdpe/files/limits.h              |   87 --
 cross/i386-netbsdpe/files/syslimits.h           |   85 --
 cross/i386-netbsdpe/patches/binutils-af         |   68 ++-
 cross/i386-netbsdpe/patches/binutils-ag         |   13 +
 cross/i386-netbsdpe/patches/binutils-ah         |   14 +
 cross/i386-netbsdpe/patches/binutils-ai         |   13 +
 cross/i386-netbsdpe/patches/binutils-aj         |   13 +
 cross/i386-netbsdpe/patches/binutils-ak         |   12 +
 cross/i386-netbsdpe/patches/patch-aa            |  763 ------------------------
 cross/i386-netbsdpe/patches/patch-ab            |    4 +-
 cross/i386-netbsdpe/patches/patch-ac            |   13 -
 cross/i386-netbsdpe/patches/patch-ad            |   29 +-
 cross/i386-netbsdpe/patches/patch-ae            |   22 +
 cross/i386-netbsdpe/patches/patch-af            |   13 +
 cross/i386-netbsdpe/patches/patch-co            |   99 +--
 cross/i386-netbsdpe/patches/patch-cp            |   44 -
 cross/i386-netbsdpe/patches/patch-cq            |   44 -
 cross/i386-netbsdpe/patches/patch-de            |   46 -
 cross/i386-netbsdpe/patches/patch-ma            |   23 -
 cross/i386-netbsdpe/patches/patch-pe            |  608 ++----------------
 29 files changed, 490 insertions(+), 2296 deletions(-)

diffs (truncated from 2951 to 300 lines):

diff -r c949a8de4c50 -r 5c9521d354a5 cross/i386-netbsdpe/Makefile
--- a/cross/i386-netbsdpe/Makefile      Tue Mar 09 12:19:09 2004 +0000
+++ b/cross/i386-netbsdpe/Makefile      Tue Mar 09 12:19:12 2004 +0000
@@ -1,64 +1,121 @@
-# $NetBSD: Makefile,v 1.14 2003/08/25 05:47:12 kent Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/09 12:19:12 kent Exp $
 
-DISTVERSION=           1.4.0
-CROSS_DISTFILES=               # none
-
+DISTVERSION=           3.3.3
 MAINTAINER=            peace-sacrifice%hauN.org@localhost
 HOMEPAGE=              http://chiharu.hauN.org/peace/
 COMMENT=               Cross-compile environment for PEACE/i386
 # Need NetBSD headers in /usr/include
 ONLY_FOR_PLATFORM=     NetBSD-1.6[Q-Z]*-* NetBSD-[2-9]*-*
+CONFLICTS=             pth-[0-9]* pth-current-[0-9]* pth-syscall-[0-9]*
+DISTNAME=              cross-${TARGET_ARCH}-${DISTVERSION}
+CATEGORIES+=           cross lang
+USE_CROSSBASE=         yes
 
 WRKSRC=                        ${WRKDIR}/${GCC_DISTNAME}
 BU_WRKSRC=             ${WRKDIR}/${BINUTILS_DISTNAME}
-
-USE_CROSS_BINUTILS=    yes
 BINUTILS_GNUTARGET=    pe-i386
 BINUTILS_LDEMULATION=  i386pe
-USE_CROSS_GCC=         yes
-GCC_FAKE_RUNTIME=      yes
-GCC_CXX=               yes
-#GCC_CXX_RUNTIME=      yes
-
 TARGET_ARCH=           i386-netbsdpe
 GCC_CONFIGURE_ARGS+=   --enable-threads
-CONFLICTS=             pth-[0-9]* pth-current-[0-9]* pth-syscall-[0-9]*
-
 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/
-DISTFILES+=            ${GCC_WIN32_PATCHBUNDLE}
+DISTFILES+=            gcc-3.3.3-20040217-1-src.diff.gz
+GCC_WIN32_PATCH=       ${WRKDIR}/gcc-3.3.3-20040217-1-src.diff
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=mingw/}
+
+MESSAGE_SUBST+=                CROSSBASE=${CROSSBASE}
+TARGET_DIR=            ${PREFIX}/${TARGET_ARCH}
 
-# SSP patch
-MASTER_SITES+=         http://www.trl.ibm.com/projects/security/ssp/gcc2_95_2/
-SSP_PATCH=             protector-2.95.2-2.tar.gz
-DISTFILES+=            ${SSP_PATCH}
+GCC_DISTNAME=          gcc-3.3.3
+GCC_INTVERSION=                3.3.3
+MASTER_SITES+=         ${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
+DISTFILES+=            ${GCC_DISTNAME}.tar.gz
+USE_GMAKE=             yes
+USE_MAKEINFO=          YES
+GCC_LANGUAGES=         c,c++
+CONFIGURE_ENV=         ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
+               CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+GCC_CONFIGURE_ARGS=    --with-gnu-ld --with-gnu-as -disable-multilib \
+               --enable-threads=posix --disable-shared --with-system-zlib \
+               --enable-languages=${GCC_LANGUAGES} --with-headers=yes \
+               --target=${TARGET_ARCH} --datadir=${TARGET_DIR}/share
+GCC_MAKE_FLAGS=                AS_FOR_TARGET="${AS_FOR_TARGET}" \
+                       AR_FOR_TARGET="${AR_FOR_TARGET}" \
+                       NM_FOR_TARGET="${NM_FOR_TARGET}" \
+                       RANLIB_FOR_TARGET="${RANLIB_FOR_TARGET}"
+#                      INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
+#                      INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+GCC_MAKE=              ${SETENV} ${MAKE_ENV} \
+                       ${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS}
+WRKOBJ=                        ${WRKDIR}/obj
+
+BINUTILS_DISTNAME=     binutils-2.15.90-20040222-1
+DISTFILES+=            ${BINUTILS_DISTNAME}-src.tar.gz
+MASTER_SITES+=         ${MASTER_SITE_SOURCEFORGE:=mingw/}
+#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
+BU_WRKSRC=             ${WRKDIR}/${BINUTILS_DISTNAME}
+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
 
 post-extract:
-#      cd ${WRKDIR} && ${PAX} -O -rz -s /${GCC_DISTNAME}/toolchain/ \
-#              -f ${_DISTDIR}/${GCC_DISTNAME}.tar.gz
-       ${PATCH} -d ${WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
-#      cd ${WRKDIR} && ${PAX} -O -rz -s /${BINUTILS_DISTNAME}/toolchain/ \
-#              -f ${_DISTDIR}/${BINUTILS_DISTNAME}.tar.bz2
+       -${PATCH} -d ${WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
+       ${CP} ${WRKSRC}/gcc/config/i386/mingw32.h ${WRKSRC}/gcc/config/i386/netbsdpe.h
+       ${CP} ${WRKSRC}/gcc/config/i386/t-cygming ${WRKSRC}/gcc/config/i386/t-netbsdpe
 
 post-patch:
-       for i in patches/binutils-*; do \
+       for i in patches/binutils-??; do \
                ${PATCH} -d ${BU_WRKSRC} --forward --quiet -E < $$i; \
        done
-       cd ${WRKSRC}/gcc && ${AUTOCONF}
-       ${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:
-       ${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}/
        ${SED} "s/^extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > ${WRKDIR}/stdio.h
 
-.include "files/cross.mk"
+do-configure:
+#      @-mkdir -p ${WRKOBJ}/libiberty
+#      @cd ${WRKOBJ}/libiberty && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
+#              CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+#              ${WRKSRC}/libiberty/configure --prefix=${PREFIX}
+       @-mkdir -p ${WRKOBJ} ${WRKOBJ}/binutils ${WRKOBJ}/gas ${WRKOBJ}/ld
+       cd ${WRKOBJ} && ${CONFIGURE_ENV} ${BU_WRKSRC}/configure \
+               --prefix=${PREFIX} ${GCC_CONFIGURE_ARGS} --disable-nls
+       cd ${WRKOBJ}/binutils && ${CONFIGURE_ENV} ${BU_WRKSRC}/binutils/configure \
+               --prefix=${PREFIX} ${GCC_CONFIGURE_ARGS} --disable-nls
+       cd ${WRKOBJ}/gas && ${CONFIGURE_ENV} ${BU_WRKSRC}/gas/configure \
+               --prefix=${PREFIX} ${GCC_CONFIGURE_ARGS} --disable-nls
+       cd ${WRKOBJ}/ld && ${CONFIGURE_ENV} ${BU_WRKSRC}/ld/configure \
+               --prefix=${PREFIX} ${GCC_CONFIGURE_ARGS} --disable-nls
+# Build binutils before configuring gcc so that gcc's configure works correctly
+       @cd ${WRKOBJ} && ${GCC_MAKE}
+       @-mkdir -p ${WRKOBJ}/gcc
+       @cd ${WRKOBJ}/gcc && ${CONFIGURE_ENV} ${WRKSRC}/gcc/configure \
+               --prefix=${PREFIX} ${GCC_CONFIGURE_ARGS}
+
+do-build:
+       ${LN} -sf ${AS_FOR_TARGET} ${WRKOBJ}/gcc/as
+       ${LN} -sf ${LD_FOR_TARGET} ${WRKOBJ}/gcc/ld
+       @cd ${WRKOBJ}/gcc && ${GCC_MAKE}
+
+do-install:
+       @cd ${WRKOBJ} && ${GCC_MAKE} installdirs install-binutils \
+               install-gas install-ld
+       @cd ${WRKOBJ}/gas/doc && ${GCC_MAKE} install-man1
+       @cd ${WRKOBJ}/gcc && ${GCC_MAKE} install-common \
+               install-libgcc install-cpp install-po \
+               lang.install-normal install-driver
+       ${INSTALL_DATA_DIR} ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include
+       ${INSTALL_DATA} ${WRKOBJ}/gcc/include/mmintrin.h \
+               ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include
+       ${INSTALL_DATA} ${WRKOBJ}/gcc/include/xmmintrin.h \
+               ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${GCC_INTVERSION}/include
+       ${INSTALL_DATA_DIR} ${TARGET_DIR}/include
+       cd ${PREFIX}/bin && ${LN} -sf ${TARGET_ARCH}-gcc ${TARGET_ARCH}-cc
+       cd ${TARGET_DIR}/bin && ${LN} -sf gcc cc
+
+.include "../../mk/bsd.pkg.mk"
diff -r c949a8de4c50 -r 5c9521d354a5 cross/i386-netbsdpe/PLIST
--- a/cross/i386-netbsdpe/PLIST Tue Mar 09 12:19:09 2004 +0000
+++ b/cross/i386-netbsdpe/PLIST Tue Mar 09 12:19:12 2004 +0000
@@ -1,7 +1,107 @@
-@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
+@comment $NetBSD: PLIST,v 1.3 2004/03/09 12:19:12 kent Exp $
+bin/i386-netbsdpe-addr2line
+bin/i386-netbsdpe-ar
+bin/i386-netbsdpe-as
+bin/i386-netbsdpe-c++
+bin/i386-netbsdpe-c++filt
+bin/i386-netbsdpe-cc
+bin/i386-netbsdpe-cpp
+bin/i386-netbsdpe-dlltool
+bin/i386-netbsdpe-dllwrap
+bin/i386-netbsdpe-g++
+bin/i386-netbsdpe-gcc
+bin/i386-netbsdpe-gcc-3.3.3
+bin/i386-netbsdpe-gccbug
+bin/i386-netbsdpe-gcov
+bin/i386-netbsdpe-ld
+bin/i386-netbsdpe-nm
+bin/i386-netbsdpe-objcopy
+bin/i386-netbsdpe-objdump
+bin/i386-netbsdpe-ranlib
+bin/i386-netbsdpe-readelf
+bin/i386-netbsdpe-size
+bin/i386-netbsdpe-strings
+bin/i386-netbsdpe-strip
+bin/i386-netbsdpe-windres
+i386-netbsdpe/bin/ar
+i386-netbsdpe/bin/as
+i386-netbsdpe/bin/c++
+i386-netbsdpe/bin/cc
+i386-netbsdpe/bin/dlltool
+i386-netbsdpe/bin/g++
+i386-netbsdpe/bin/gcc
+i386-netbsdpe/bin/ld
+i386-netbsdpe/bin/nm
+i386-netbsdpe/bin/ranlib
+i386-netbsdpe/bin/strip
+i386-netbsdpe/lib/ldscripts/i386pe.x
+i386-netbsdpe/lib/ldscripts/i386pe.xbn
+i386-netbsdpe/lib/ldscripts/i386pe.xn
+i386-netbsdpe/lib/ldscripts/i386pe.xr
+i386-netbsdpe/lib/ldscripts/i386pe.xu
+i386-netbsdpe/share/locale/be/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/ca/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/da/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/de/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/el/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/es/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/fr/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/ja/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/nl/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/sv/LC_MESSAGES/gcc.mo
+i386-netbsdpe/share/locale/tr/LC_MESSAGES/gcc.mo
+lib/gcc-lib/i386-netbsdpe/3.3.3/cc1
+lib/gcc-lib/i386-netbsdpe/3.3.3/cc1plus
+lib/gcc-lib/i386-netbsdpe/3.3.3/collect2
+lib/gcc-lib/i386-netbsdpe/3.3.3/include/mmintrin.h
+lib/gcc-lib/i386-netbsdpe/3.3.3/include/xmmintrin.h
+lib/gcc-lib/i386-netbsdpe/3.3.3/libgcc.a
+lib/gcc-lib/i386-netbsdpe/3.3.3/specs
+man/man1/i386-netbsdpe-addr2line.1
+man/man1/i386-netbsdpe-ar.1
+man/man1/i386-netbsdpe-as.1
+man/man1/i386-netbsdpe-c++filt.1
+man/man1/i386-netbsdpe-dlltool.1
+man/man1/i386-netbsdpe-ld.1
+man/man1/i386-netbsdpe-nlmconv.1
+man/man1/i386-netbsdpe-nm.1
+man/man1/i386-netbsdpe-objcopy.1
+man/man1/i386-netbsdpe-objdump.1
+man/man1/i386-netbsdpe-ranlib.1
+man/man1/i386-netbsdpe-readelf.1
+man/man1/i386-netbsdpe-size.1
+man/man1/i386-netbsdpe-strings.1
+man/man1/i386-netbsdpe-strip.1
+man/man1/i386-netbsdpe-windres.1
+@dirrm lib/gcc-lib/i386-netbsdpe/3.3.3/include
+@dirrm lib/gcc-lib/i386-netbsdpe/3.3.3
+@dirrm lib/gcc-lib/i386-netbsdpe
+@dirrm i386-netbsdpe/share/locale/tr/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/tr
+@dirrm i386-netbsdpe/share/locale/sv/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/sv
+@dirrm i386-netbsdpe/share/locale/nl/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/nl
+@dirrm i386-netbsdpe/share/locale/ja/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/ja
+@dirrm i386-netbsdpe/share/locale/fr/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/fr
+@dirrm i386-netbsdpe/share/locale/es/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/es
+@dirrm i386-netbsdpe/share/locale/el/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/el
+@dirrm i386-netbsdpe/share/locale/de/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/de
+@dirrm i386-netbsdpe/share/locale/da/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/da
+@dirrm i386-netbsdpe/share/locale/ca/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/ca
+@dirrm i386-netbsdpe/share/locale/be/LC_MESSAGES
+@dirrm i386-netbsdpe/share/locale/be
+@dirrm i386-netbsdpe/share/locale
+@dirrm i386-netbsdpe/share
+@dirrm i386-netbsdpe/lib/ldscripts
+@dirrm i386-netbsdpe/lib
+@dirrm i386-netbsdpe/include
+@dirrm i386-netbsdpe/bin
+@dirrm i386-netbsdpe
diff -r c949a8de4c50 -r 5c9521d354a5 cross/i386-netbsdpe/distinfo
--- a/cross/i386-netbsdpe/distinfo      Tue Mar 09 12:19:09 2004 +0000
+++ b/cross/i386-netbsdpe/distinfo      Tue Mar 09 12:19:12 2004 +0000
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.7 2003/04/27 13:50:09 kent Exp $
+$NetBSD: distinfo,v 1.8 2004/03/09 12:19:12 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
-SHA1 (protector-2.95.2-2.tar.gz) = 7b906b45e4e08e414ec8bca611d5371d82994401
-Size (protector-2.95.2-2.tar.gz) = 17034 bytes
-SHA1 (binutils-030425.tar.bz2) = a6355ca1482c8feb334c62726c2663213c15649c
-Size (binutils-030425.tar.bz2) = 10847130 bytes
-SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
-Size (gcc-2.95.2.tar.gz) = 12885815 bytes
-SHA1 (patch-aa) = cd270eb18e0b65641a416c1215388dc9fb91f33d
-SHA1 (patch-ab) = 67dca1c7321895f200de2527ec4195a120b6eab0
-SHA1 (patch-ac) = 03d5220ff8fb9e661069d08247fd5eab89b670e0
-SHA1 (patch-ad) = eed88816a84246659a9179d0cda6bc4ac967e4c2
-SHA1 (patch-co) = 8a6ca102d76ebda1dc4edf5d65da2a5d4cedb183
-SHA1 (patch-cp) = f94a5dfdb13cf00cc06854617defa56e8370d3b8



Home | Main Index | Thread Index | Old Index