pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/gcc5-aux lang/gcc5-aux: Fix runpath, at least for...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9262065e757b
branches:  trunk
changeset: 355642:9262065e757b
user:      marino <marino%pkgsrc.org@localhost>
date:      Thu Dec 08 03:31:27 2016 +0000

description:
lang/gcc5-aux: Fix runpath, at least for non-NetBSD platforms

NetBSD doesn't seem to be honoring -rpath, at least not with binutils
from base.  Using binutils from pkgsrc doesn't work either because it
uses the gold linker (for an unknown reason) which fails with an
"unsupported operation".  As a result, gcc5-aux was limited to base
binutils for NetBSD 7 and later.  The issue was never resolved.

diffstat:

 lang/gcc5-aux/Makefile         |  4 ++--
 lang/gcc5-aux/Makefile.version |  4 ++--
 lang/gcc5-aux/files/diff-core  |  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r fff34f049fa7 -r 9262065e757b lang/gcc5-aux/Makefile
--- a/lang/gcc5-aux/Makefile    Thu Dec 08 02:56:11 2016 +0000
+++ b/lang/gcc5-aux/Makefile    Thu Dec 08 03:31:27 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/11/26 16:12:18 marino Exp $
+# $NetBSD: Makefile,v 1.5 2016/12/08 03:31:27 marino Exp $
 #
 
 PKGNAME=       gcc5-aux-${SNAPSHOT}
@@ -241,7 +241,7 @@
          -pe 's|readelf -s|greadelf -s|' ${WRKSRC}/contrib/make_sunver.pl
        # Update LINK_SPEC to add gcc5-aux lib runpath in every binary
        @${ECHO} "Configuring LINK_SPEC runpath"
-       ${PERL5} -pi -e 's;\@PREFIX\@;${PREFIX};' \
+       ${PERL5} -pi -e 's;\@PREFIX\@/\@GCCAUX\@;${PREFIX}/gcc5-aux;' \
          ${WRKSRC}/gcc/config/dragonfly.h \
          ${WRKSRC}/gcc/config/i386/freebsd.h \
          ${WRKSRC}/gcc/config/i386/netbsd-elf.h
diff -r fff34f049fa7 -r 9262065e757b lang/gcc5-aux/Makefile.version
--- a/lang/gcc5-aux/Makefile.version    Thu Dec 08 02:56:11 2016 +0000
+++ b/lang/gcc5-aux/Makefile.version    Thu Dec 08 03:31:27 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.4 2016/11/26 16:12:18 marino Exp $
+# $NetBSD: Makefile.version,v 1.5 2016/12/08 03:31:27 marino Exp $
 #
 
 SNAPSHOT=      20160603
@@ -6,7 +6,7 @@
 GCC_POINT=     4.0
 GCC_VERSION=   ${GCC_BRANCH}.${GCC_POINT}
 BUILD_RELEASE= yes
-MAIN_PR=       1
+MAIN_PR=       2
 
 .if ${BUILD_RELEASE:Mno}
 # Snapshot naming pattern
diff -r fff34f049fa7 -r 9262065e757b lang/gcc5-aux/files/diff-core
--- a/lang/gcc5-aux/files/diff-core     Thu Dec 08 02:56:11 2016 +0000
+++ b/lang/gcc5-aux/files/diff-core     Thu Dec 08 03:31:27 2016 +0000
@@ -295,7 +295,7 @@
  #undef LINK_SPEC
 -#define LINK_SPEC NETBSD_LINK_SPEC_ELF
 +#define LINK_SPEC NETBSD_LINK_SPEC_ELF \
-+"%{!static:-rpath @PREFIX@/gcc5-aux/lib}"
++"%{!static:-rpath @PREFIX@/@GCCAUX@/lib}"
  
  #define NETBSD_ENTRY_POINT "__start"
  



Home | Main Index | Thread Index | Old Index