summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authormarino <marino>2013-12-29 19:16:53 +0000
committermarino <marino>2013-12-29 19:16:53 +0000
commit2783fd222383a13c8a3837f03f42457cbe4b3ad9 (patch)
tree18cbefc17bf0694d3d12f86fad818152bbd69695 /lang
parentbd7c8c17bde8ebc61b6cbc8f558fb49d1c8287da (diff)
downloadpkgsrc-2783fd222383a13c8a3837f03f42457cbe4b3ad9.tar.gz
lang/gcc-aux: Fix build for pure NetBSD/clang amd64 system
A new bootstrap was necesssary to allow gcc-aux to build on a NetBSD system that has no gcc files on the system. Other changes include: * Remove support for NetBSD 5.99 * Remove defunct mirror site * Restore action install stripped binaries (gcc bug fixed)
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc-aux/Makefile30
-rw-r--r--lang/gcc-aux/distinfo8
2 files changed, 18 insertions, 20 deletions
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 24a311bb30c..a02f4d69e06 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2013/07/20 19:47:19 marino Exp $
+# $NetBSD: Makefile,v 1.12 2013/12/29 19:16:53 marino Exp $
#
PKGNAME= gcc-aux-${SNAPSHOT}
DISTNAME= gcc-${GCC_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
DISTFILES= ${DISTNAME}.tar.bz2
@@ -65,9 +65,7 @@ LINK_HEADER= /usr/include/sys/link_elf.h
.if ${OPSYS} == "NetBSD"
-.if !empty(OS_VERSION:M5.99.*)
- NSUFF= 6.0_DEV
-.elif !empty(OS_VERSION:M6.99.*)
+.if !empty(OS_VERSION:M6.99.*)
NSUFF= 7.0_DEV
.else
NSUFF= ${OS_VERSION}
@@ -84,10 +82,10 @@ MY_CONFIGURE_ENV+= LDFLAGS=-lm
.endif
.if ${MACHINE_ARCH} == "x86_64"
OS_LABEL4VERS= [NetBSD64]
- BOOTSTRAP_TRIPLET= x86_64-bootstrap-netbsd5.1/4.6.0
+ BOOTSTRAP_TRIPLET= x86_64-aux-netbsd6.1/4.7.3
BLD_TARGET= ${MACHINE_ARCH}-aux-netbsd${NSUFF}
.endif
-BOOTSTRAP_COMPILER= gnat-bootstrap.${MACHINE_ARCH}.netbsd.tar.bz2
+BOOTSTRAP_COMPILER= gnat-bootstrap2.${MACHINE_ARCH}.netbsd.tar.bz2
LINK_HEADER= /usr/include/link_elf.h
.endif
@@ -137,9 +135,12 @@ FULL_GNATGCC=${LOCALBASE}/gcc-aux/bin/ada
INTENDED_COMPILER=BOOTSTRAP
FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc
DISTFILES+= ${BOOTSTRAP_COMPILER}
-SITES.${BOOTSTRAP_COMPILER}= http://downloads.dragonlace.net/src/ \
- http://dragonlace.mirrors.ada.cx/src/
+SITES.${BOOTSTRAP_COMPILER}= http://downloads.dragonlace.net/src/
FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin
+. if ${OPSYS} == NetBSD
+MY_CONFIGURE_ENV+= LD_LIBRARY_PATH=${BOOTSTRAP_PREFIX}/lib
+EXTRA_LLP=:${BOOTSTRAP_PREFIX}/lib
+. endif
.endif
@@ -147,8 +148,8 @@ FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:$
#DISTFILES+= \
# gnat-bootstrap.i386.dragonfly.tar.bz2 \
# gnat-bootstrap.x86_64.dragonfly.tar.bz2 \
-# gnat-bootstrap.i386.netbsd.tar.bz2 \
-# gnat-bootstrap.x86_64.netbsd.tar.bz2 \
+# gnat-bootstrap2.i386.netbsd.tar.bz2 \
+# gnat-bootstrap2.x86_64.netbsd.tar.bz2 \
# gnat-bootstrap.i386.solaris.tar.bz2
@@ -157,7 +158,7 @@ MY_CONFIGURE_ENV+= CC=${FULL_GNATGCC}
MY_CONFIGURE_ENV+= PATH=${FULL_PATH}
MY_MAKE_ENV= PATH=${FULL_PATH}
MY_MAKE_ENV+= ICONVPREFIX=${PREFIX}
-MY_MAKE_ENV+= LD_LIBRARY_PATH=${BUILDDIR}/gcc
+MY_MAKE_ENV+= LD_LIBRARY_PATH=${BUILDDIR}/gcc${EXTRA_LLP}
# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
# a binary so we need to make sure we give it the installed sed and not
# the tool wrapped one.
@@ -331,10 +332,7 @@ test-c:
do-install:
- # This was install-strip, but a bug in 4.7.x prevents libobjc
- # from installation. Just install the unstripped version until
- # it's fixed (Bug filed with GCC: 54720)
- cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} install \
+ cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} install-strip \
DESTDIR=${DESTDIR}
diff --git a/lang/gcc-aux/distinfo b/lang/gcc-aux/distinfo
index 3c75aba77f7..9b88ff3ea6a 100644
--- a/lang/gcc-aux/distinfo
+++ b/lang/gcc-aux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/08/15 10:58:42 marino Exp $
+$NetBSD: distinfo,v 1.6 2013/12/29 19:16:53 marino Exp $
SHA1 (gcc-4.7.3.tar.bz2) = 69e02737bd6e1a7c6047d801600d39c32b9427ca
RMD160 (gcc-4.7.3.tar.bz2) = b4ba153b098cad726ecd28195ee445aa542d37ae
@@ -12,9 +12,9 @@ Size (gnat-bootstrap.i386.netbsd.tar.bz2) = 27654956 bytes
SHA1 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 77a637a497c61e4085de31b24a205f24b1776a15
RMD160 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 4d0eb7b8a5f901333f1ffd190a5bf72072b2b52e
Size (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 31380342 bytes
-SHA1 (gnat-bootstrap.x86_64.netbsd.tar.bz2) = 84f0e9179998daa643046a5d139321c4130ea84d
-RMD160 (gnat-bootstrap.x86_64.netbsd.tar.bz2) = 0b2943349536c323a62b56dc05ff1fedd6d7e17a
-Size (gnat-bootstrap.x86_64.netbsd.tar.bz2) = 30572187 bytes
+SHA1 (gnat-bootstrap2.x86_64.netbsd.tar.bz2) = d94354ff0254015f0e10946529fcc8867e7e1407
+RMD160 (gnat-bootstrap2.x86_64.netbsd.tar.bz2) = 21fed1a92f67132e694b18bf94f05a6f3a5dc573
+Size (gnat-bootstrap2.x86_64.netbsd.tar.bz2) = 48612587 bytes
SHA1 (gnat-bootstrap.i386.solaris.tar.bz2) = 4962657bfc894a20ad3102c1f6fe8e566b47cb51
RMD160 (gnat-bootstrap.i386.solaris.tar.bz2) = ae72e76d0aba94451d99b9a70a3c049c9258cc82
Size (gnat-bootstrap.i386.solaris.tar.bz2) = 43247034 bytes