diff options
| author | pho <pho@pkgsrc.org> | 2014-05-15 22:53:46 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2014-05-15 22:53:46 +0000 |
| commit | c480008ebe1938568da3b3bd956150933785073b (patch) | |
| tree | d5398b4aec87de1a52056635d6d4da50d6e8a237 /lang/gcc44 | |
| parent | b91fb0d153269e0ffeb94ab149db4539656f3355 (diff) | |
| download | pkgsrc-c480008ebe1938568da3b3bd956150933785073b.tar.gz | |
PR pkg/48740 - Fix problems on Darwin
Makefile:
See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
create a stub library, not just to remove symbols, so we must not
let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
build fails for missing files.
patches/patch-ac:
Remove the whitespace between $(LINKER_RPATH_FLAG) and the path.
Otherwise the flag may be misinterpreted by linker (e.g. Apple's ld)
Diffstat (limited to 'lang/gcc44')
| -rw-r--r-- | lang/gcc44/Makefile | 9 | ||||
| -rw-r--r-- | lang/gcc44/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc44/patches/patch-ac | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 2b2b4fe3a93..e447812e040 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/05/31 12:41:11 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2014/05/15 22:53:46 pho Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc44-${GCC_VERSION} @@ -69,6 +69,13 @@ CONFIGURE_ARGS+= --enable-long-long CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --disable-libssp CONFIGURE_ARGS+= --enable-threads=posix +.if ${OPSYS} == "Darwin" +# See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to +# create a stub library, not just to remove symbols, so we must not +# let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the +# build fails for missing files. +CONFIGURE_ARGS+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip} +.endif CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index bbd05c65589..31631305cb5 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.18 2014/05/06 15:28:16 richard Exp $ +$NetBSD: distinfo,v 1.19 2014/05/15 22:53:46 pho Exp $ SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75 RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a Size (gcc-4.4.7.tar.bz2) = 63179340 bytes -SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee +SHA1 (patch-ac) = a837b37b51d3829d146819da48d7c170686f9fc0 SHA1 (patch-ad) = 96722d5af63a955e3d9c934b1249e5e8a1173a8c SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621 SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b diff --git a/lang/gcc44/patches/patch-ac b/lang/gcc44/patches/patch-ac index bdb642b04be..d1d2c9421fa 100644 --- a/lang/gcc44/patches/patch-ac +++ b/lang/gcc44/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2011/02/25 13:34:56 hans Exp $ +$NetBSD: patch-ac,v 1.3 2014/05/15 22:53:46 pho Exp $ --- gcc/Makefile.in.orig 2004-06-17 15:56:58.000000000 -0600 +++ gcc/Makefile.in @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.2 2011/02/25 13:34:56 hans Exp $ # Language-independent files. DRIVER_DEFINES = \ -+ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(exec_prefix)/lib\"" \ ++ -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(exec_prefix)/lib\"" \ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ |