CVS commit: pkgsrc/lang/gcc5-aux

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Thu Dec  8 03:31:27 UTC 2016

Modified Files:
        pkgsrc/lang/gcc5-aux: Makefile Makefile.version
        pkgsrc/lang/gcc5-aux/files: diff-core

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc5-aux/Makefile \
    pkgsrc/lang/gcc5-aux/Makefile.version
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc5-aux/files/diff-core

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc5-aux/Makefile
diff -u pkgsrc/lang/gcc5-aux/Makefile:1.4 pkgsrc/lang/gcc5-aux/Makefile:1.5
--- pkgsrc/lang/gcc5-aux/Makefile:1.4   Sat Nov 26 16:12:18 2016
+++ pkgsrc/lang/gcc5-aux/Makefile       Thu Dec  8 03:31:27 2016
@@ -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 @@ post-extract:
          -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
Index: pkgsrc/lang/gcc5-aux/Makefile.version
diff -u pkgsrc/lang/gcc5-aux/Makefile.version:1.4 pkgsrc/lang/gcc5-aux/Makefile.version:1.5
--- pkgsrc/lang/gcc5-aux/Makefile.version:1.4   Sat Nov 26 16:12:18 2016
+++ pkgsrc/lang/gcc5-aux/Makefile.version       Thu Dec  8 03:31:27 2016
@@ -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_BRANCH=     5
 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

Index: pkgsrc/lang/gcc5-aux/files/diff-core
diff -u pkgsrc/lang/gcc5-aux/files/diff-core:1.3 pkgsrc/lang/gcc5-aux/files/diff-core:1.4
--- pkgsrc/lang/gcc5-aux/files/diff-core:1.3    Sat Nov 26 16:12:18 2016
+++ pkgsrc/lang/gcc5-aux/files/diff-core        Thu Dec  8 03:31:27 2016
@@ -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"