[pkgsrc/trunk]: pkgsrc/lang/gcc8 gcc8: Pass default RPATH like gcc7, bump PKG...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0cccd9ccf054
branches:  trunk
changeset: 439324:0cccd9ccf054
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Thu Sep 17 22:04:15 2020 +0000

description:
gcc8: Pass default RPATH like gcc7, bump PKGREVISION

diffstat:

 lang/gcc8/Makefile                      |  10 ++++++++--
 lang/gcc8/distinfo                      |   4 ++--
 lang/gcc8/patches/patch-gcc_Makefile.in |  11 ++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diffs (69 lines):

diff -r 31305de92d74 -r 0cccd9ccf054 lang/gcc8/Makefile
--- a/lang/gcc8/Makefile        Thu Sep 17 21:13:33 2020 +0000
+++ b/lang/gcc8/Makefile        Thu Sep 17 22:04:15 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2020/08/31 18:09:49 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2020/09/17 22:04:15 ryoon Exp $
 
 GCC_PKGNAME=           gcc8
-PKGREVISION=           1
+PKGREVISION=           2
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC8_DIST_VERSION}
@@ -72,6 +72,12 @@
 SUBST_SED.fixinc=      -e "s,\./fixinc.sh,-c true,"
 .endif
 
+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=       MACHINE_GNU_PLATFORM
+
 .include "options.mk"
 
 ## For graphite support.
diff -r 31305de92d74 -r 0cccd9ccf054 lang/gcc8/distinfo
--- a/lang/gcc8/distinfo        Thu Sep 17 21:13:33 2020 +0000
+++ b/lang/gcc8/distinfo        Thu Sep 17 22:04:15 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2020/04/08 06:39:57 wiz Exp $
+$NetBSD: distinfo,v 1.13 2020/09/17 22:04:15 ryoon Exp $
 
 SHA1 (gcc-8.4.0.tar.xz) = 00ddb177b04caffd40f7af0175d5b3c8e5442545
 RMD160 (gcc-8.4.0.tar.xz) = 4b3890e8865fae1d2b91166fb98e1097f5401d4a
@@ -11,7 +11,7 @@
 SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
 SHA1 (patch-fixincludes_fixincl.x) = f4d3504db0480f8a3443a684e0132a521a06b026
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
-SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
+SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_config.gcc) = 4a971d1df7f05cfaefdf462d1b7c6dea1e838713
 SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = b10ef4b9ad39e605fc4e2a0c8dffdae677842e94
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = bf45de53dfbf2cf5298cc8836996e19e2fd67274
diff -r 31305de92d74 -r 0cccd9ccf054 lang/gcc8/patches/patch-gcc_Makefile.in
--- a/lang/gcc8/patches/patch-gcc_Makefile.in   Thu Sep 17 21:13:33 2020 +0000
+++ b/lang/gcc8/patches/patch-gcc_Makefile.in   Thu Sep 17 22:04:15 2020 +0000
@@ -1,15 +1,16 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2018/05/05 04:08:36 maya Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2020/09/17 22:04:15 ryoon 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/\" \