CVS commit: pkgsrc/lang/gcc7

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 23 08:11:16 UTC 2018

Modified Files:
        pkgsrc/lang/gcc7: Makefile distinfo
        pkgsrc/lang/gcc7/patches: patch-gcc_Makefile.in

Log Message:
gcc7: Fix LINK_LIBGCC_SPEC patch.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc7/patches/patch-gcc_Makefile.in

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

Modified files:

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.16 pkgsrc/lang/gcc7/Makefile:1.17
--- pkgsrc/lang/gcc7/Makefile:1.16      Sun Jan 28 16:24:14 2018
+++ pkgsrc/lang/gcc7/Makefile   Wed May 23 08:11:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/01/28 16:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/05/23 08:11:16 jperkin Exp $
 
 GCC_PKGNAME=           gcc7
 PKGREVISION=           1
@@ -46,7 +46,7 @@ SUBST_CLASSES+=               vars
 SUBST_MESSAGE.vars=    Setting target machine name path in ${SUBST_FILES.vars}
 SUBST_STAGE.vars=      pre-configure
 SUBST_FILES.vars=      gcc/Makefile.in
-SUBST_VARS.vars=       GCC_TARGET_MACHINE
+SUBST_VARS.vars=       MACHINE_GNU_PLATFORM
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.8 pkgsrc/lang/gcc7/distinfo:1.9
--- pkgsrc/lang/gcc7/distinfo:1.8       Thu Jan 25 23:27:30 2018
+++ pkgsrc/lang/gcc7/distinfo   Wed May 23 08:11:16 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2018/01/25 23:27:30 maya Exp $
+$NetBSD: distinfo,v 1.9 2018/05/23 08:11:16 jperkin Exp $
 
 SHA1 (gcc-7.3.0.tar.xz) = 9689b9cae7b2886fdaa08449a26701f095c04e48
 RMD160 (gcc-7.3.0.tar.xz) = 31f6934a0e0c0ca84b6668110f9afdb91c1f9023
@@ -9,7 +9,7 @@ RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
 SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
-SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
+SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_config.gcc) = 943797cbbdbf25885b4f16a1a027d137ef68357e
 SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633

Index: pkgsrc/lang/gcc7/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc7/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc7/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc7/patches/patch-gcc_Makefile.in:1.1  Wed May  3 00:21:03 2017
+++ pkgsrc/lang/gcc7/patches/patch-gcc_Makefile.in      Wed May 23 08:11:16 2018
@@ -1,15 +1,16 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2017/05/03 00:21:03 maya Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2018/05/23 08:11:16 jperkin Exp $
 
-Add gcc libdir to a programs rpath so that _this gcc's_ support libraries
-are found.
+Ensure libgcc from this GCC is found before others.  Note that there must
+not be a whitespace between $(LINKER_RPATH_FLAG) and the path.  Otherwise
+the flag may be misinterpreted by the linker (e.g. Apple ld).
 
---- gcc/Makefile.in.orig       2017-04-18 18:10:27.000000000 +0000
+--- gcc/Makefile.in.orig       2017-05-02 16:12:40.965506000 +0000
 +++ gcc/Makefile.in
 @@ -2112,6 +2112,7 @@ prefix.o: $(BASEVER)
  # Language-independent files.
  
  DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)//lib/%M $(LINKER_RPATH_FLAG) $(libdir)/%M \"" \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(prefix)/@MACHINE_GNU_PLATFORM@/lib/%M $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \