summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorkent <kent@pkgsrc.org>2003-04-27 13:50:09 +0000
committerkent <kent@pkgsrc.org>2003-04-27 13:50:09 +0000
commit5aae654db517b98ec2f30e1ce4bd4de261027c30 (patch)
treed78e4549bd335c74ec3375d7241279e2f3bf903b /cross
parente635dae1094de031c15dc6d27efc0ff0b1f7d485 (diff)
downloadpkgsrc-5aae654db517b98ec2f30e1ce4bd4de261027c30.tar.gz
Update to 1.4.0
- update binutils: 3.13 -> 030425 snapshot - use native pthread.h instead of unproven-pthread
Diffstat (limited to 'cross')
-rw-r--r--cross/i386-netbsdpe/Makefile32
-rw-r--r--cross/i386-netbsdpe/distinfo8
-rw-r--r--cross/i386-netbsdpe/files/cross.mk24
-rw-r--r--cross/i386-netbsdpe/patches/binutils-af14
4 files changed, 36 insertions, 42 deletions
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index a7a2c85801a..55a6426f9bf 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.12 2003/04/10 20:10:15 grant Exp $
-# $PEACE: Makefile,v 1.21 2002/08/21 02:48:23 kent Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/27 13:50:09 kent Exp $
-DISTVERSION= 1.3.4
+DISTVERSION= 1.4.0
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-*-*
+ONLY_FOR_PLATFORM= NetBSD-1.6[Q-Z]*-* NetBSD-[2-9]*-*
-WRKSRC= ${WRKDIR}/toolchain
+WRKSRC= ${WRKDIR}/${GCC_DISTNAME}
+BU_WRKSRC= ${WRKDIR}/${BINUTILS_DISTNAME}
USE_CROSS_BINUTILS= yes
BINUTILS_GNUTARGET= pe-i386
@@ -36,29 +36,18 @@ 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}
-# pthread
-PTHREAD_DISTNAME= unproven-pthreads-0.17
-PTHREAD_DISTFILE= ${PTHREAD_DISTNAME}.tar.gz
-MASTER_SITES+= ftp://ftp.flame.org/pub/netbsd/
-DISTFILES+= ${PTHREAD_DISTFILE}
-
-EXTRACT_ONLY= ${GCC_WIN32_PATCHBUNDLE} ${SSP_PATCH} ${PTHREAD_DISTFILE}
-
post-extract:
- cd ${WRKDIR} && ${PAX} -O -rz -s /${GCC_DISTNAME}/toolchain/ \
- -f ${_DISTDIR}/${GCC_DISTNAME}.tar.gz
+# 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
+# cd ${WRKDIR} && ${PAX} -O -rz -s /${BINUTILS_DISTNAME}/toolchain/ \
+# -f ${_DISTDIR}/${BINUTILS_DISTNAME}.tar.bz2
post-patch:
for i in patches/binutils-*; do \
- ${PATCH} -d ${WRKSRC} --forward --quiet -E < $$i; \
+ ${PATCH} -d ${BU_WRKSRC} --forward --quiet -E < $$i; \
done
cd ${WRKSRC}/gcc && ${AUTOCONF}
- cd ${WRKSRC}/gcc && \
- ${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread.h . && \
- ${LN} -s ../../${PTHREAD_DISTNAME}/include/pthread .
${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
@@ -71,5 +60,4 @@ post-configure:
${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/
${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/distinfo b/cross/i386-netbsdpe/distinfo
index 821b9628506..ca0e7912e82 100644
--- a/cross/i386-netbsdpe/distinfo
+++ b/cross/i386-netbsdpe/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.6 2002/10/16 05:11:00 kent Exp $
+$NetBSD: distinfo,v 1.7 2003/04/27 13:50:09 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 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
-Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
-SHA1 (binutils-2.13.tar.bz2) = 5d6aa1f4f97da617d1c7f99c8f2ceee146eb5369
-Size (binutils-2.13.tar.bz2) = 9882367 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
diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk
index 318146b1d4d..42371ec81c8 100644
--- a/cross/i386-netbsdpe/files/cross.mk
+++ b/cross/i386-netbsdpe/files/cross.mk
@@ -1,11 +1,7 @@
-# $NetBSD: cross.mk,v 1.12 2002/10/03 14:26:45 wiz Exp $
-# $PEACE: cross.mk,v 1.12 2002/08/21 02:48:24 kent Exp $
+# $NetBSD: cross.mk,v 1.13 2003/04/27 13:50:09 kent Exp $
# based on pkgsrc/cross/COMMON/cross.mk
# NetBSD: cross.mk,v 1.16 2000/11/09 13:04:55 wiz Exp
-# Shared definitions for building a cross-compile environment.
-# We have to switch to COMMON/cross.mk when it is upgraded for the new gcc.
-
DISTNAME= cross-${TARGET_ARCH}-${DISTVERSION}
CATEGORIES+= cross lang
USE_CROSSBASE= yes
@@ -30,9 +26,9 @@ pre-install-dirs:
${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
.if defined(USE_CROSS_BINUTILS)
-BINUTILS_DISTNAME= binutils-2.13
+BINUTILS_DISTNAME= binutils-030425
DISTFILES+= ${BINUTILS_DISTNAME}.tar.bz2
-SITES_binutils-020711.tar.bz2= ftp://ftp.netbsd.org/pub/NetBSD/misc/kent/
+SITES_binutils-030425.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
@@ -120,7 +116,15 @@ gcc-configure:
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- ${WRKSRC}/configure --prefix=${PREFIX} \
+ ${BU_WRKSRC}/configure --prefix=${PREFIX} \
+ --host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \
+ ${GCC_CONFIGURE_ARGS} ${CXX_CONFIGURE_ARGS}
+ @-mkdir ${WRKOBJ}/gcc
+ @cd ${WRKOBJ}/gcc && ${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}" \
+ ${WRKSRC}/gcc/configure --prefix=${PREFIX} \
--host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \
${GCC_CONFIGURE_ARGS} ${CXX_CONFIGURE_ARGS}
.if defined(GCC_FAKE_RUNTIME)
@@ -130,6 +134,8 @@ gcc-configure:
.endif
gcc-build:
+ ${LN} -s ${AS_FOR_TARGET} ${WRKOBJ}/gcc/as
+ ${LN} -s ${LD_FOR_TARGET} ${WRKOBJ}/gcc/ld
@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)
@@ -190,4 +196,4 @@ post-install-plist:
.include "../../mk/autoconf.mk"
.include "../../mk/bsd.pkg.mk"
-EXTRACT_BEFORE_ARGS:= -X ${COMMON_DIR}/exclude ${EXTRACT_BEFORE_ARGS}
+#EXTRACT_BEFORE_ARGS:= -X ${COMMON_DIR}/exclude ${EXTRACT_BEFORE_ARGS}
diff --git a/cross/i386-netbsdpe/patches/binutils-af b/cross/i386-netbsdpe/patches/binutils-af
index 9774e9d4545..5ef084e586e 100644
--- a/cross/i386-netbsdpe/patches/binutils-af
+++ b/cross/i386-netbsdpe/patches/binutils-af
@@ -1,11 +1,13 @@
---- 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 @@
+$NetBSD: binutils-af,v 1.2 2003/04/27 13:50:10 kent Exp $
+
+--- binutils/dlltool.c.orig Fri Dec 13 06:10:09 2002
++++ binutils/dlltool.c
+@@ -1403,6 +1403,8 @@
for (excl_item = excludes; excl_item; excl_item = excl_item->next)
if (strcmp (string, excl_item->string) == 0)
- return true;
+ return TRUE;
+ if (string[0] != '_')
-+ return true;
- return false;
++ return TRUE;
+ return FALSE;
}