CVS commit: pkgsrc/lang

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:55:38 UTC 2025

Modified Files:
        pkgsrc/lang/gcc12: Makefile Makefile.common distinfo
        pkgsrc/lang/gcc12-libs: Makefile
        pkgsrc/lang/gcc12/patches: patch-gcc_Makefile.in

Log Message:
lang/gcc12*: Fix LINK_LIBGCC_SPEC.

PR pkg/58963: gcc: LINK_LIBGCC_SPEC snafu
PR pkg/48740: lang/gcc44 to gcc46 linker fails because of whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc12/Makefile \
    pkgsrc/lang/gcc12/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc12/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc12-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc12/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/gcc12/Makefile
diff -u pkgsrc/lang/gcc12/Makefile:1.10 pkgsrc/lang/gcc12/Makefile:1.11
--- pkgsrc/lang/gcc12/Makefile:1.10     Fri Jun 28 17:55:09 2024
+++ pkgsrc/lang/gcc12/Makefile  Tue Jan  7 19:55:37 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2024/06/28 17:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2025/01/07 19:55:37 riastradh Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC12_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc12-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
+PKGREVISION=   1
 COMMENT=       The GNU Compiler Collection (GCC) - 12.0 Release Series
 
 LANGS=                 c
Index: pkgsrc/lang/gcc12/distinfo
diff -u pkgsrc/lang/gcc12/distinfo:1.10 pkgsrc/lang/gcc12/distinfo:1.11
--- pkgsrc/lang/gcc12/distinfo:1.10     Fri Dec 20 09:29:10 2024
+++ pkgsrc/lang/gcc12/distinfo  Tue Jan  7 19:55:37 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2024/12/20 09:29:10 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2025/01/07 19:55:37 riastradh Exp $
 
 BLAKE2s (gcc-12.4.0.diff) = ff17898717cb3781dd802a3376ce9a659df97d7d4a3ec3c4bd26279755ab752b
 SHA512 (gcc-12.4.0.diff) = 1e5df17525c13ff3b79117ffb426726c47a9bbb1ffb8555a75083eff5b2134c728decf765be24e4e0bb21685e60973211e359027e9b90f298e24b501cbc899aa
@@ -9,7 +9,7 @@ Size (gcc-12.4.0.tar.xz) = 83377372 byte
 BLAKE2s (isl-0.16.1.tar.bz2) = 01c3fc657326e81414986eb7ede6f73e540b97009745ced125cdf7f4a8d80f61
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
-SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
+SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
 SHA1 (patch-gcc_config.gcc) = 260f187048260e539e928bb04594b6394bb03912
 SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827

Index: pkgsrc/lang/gcc12/Makefile.common
diff -u pkgsrc/lang/gcc12/Makefile.common:1.9 pkgsrc/lang/gcc12/Makefile.common:1.10
--- pkgsrc/lang/gcc12/Makefile.common:1.9       Wed Jul 24 23:01:27 2024
+++ pkgsrc/lang/gcc12/Makefile.common   Tue Jan  7 19:55:37 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2024/07/24 23:01:27 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.10 2025/01/07 19:55:37 riastradh Exp $
 # used by lang/gcc12-libjit/Makefile
 
 GCC_PKGNAME=           gcc12
@@ -150,6 +150,22 @@ SUBST_FILES.ccs=   contrib/make_sunver.pl
 SUBST_SED.ccs=         -e 's,/usr/ccs/bin,/usr/bin,g'
 .endif
 
+# DO NOT REMOVE THIS SUBST.  If it fails, the corruption to
+# patch-gcc_Makefile.in chronicled in PR pkg/58963 `gcc:
+# LINK_LIBGCC_SPEC snafu' <https://gnats.NetBSD.org/58963> probably got
+# replicated yet again.  You must make sure that LINK_LIBGCC_SPEC is
+# appropriately set with @GCC_TARGET_MACHINE@ in patch-gcc_Makefile.in
+# or similar, or confirm with a discussion on tech-pkg@ that it is no
+# longer relevant before you remove this SUBST.
+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
+
+GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
+BUILD_DEFS+=           GCC_TARGET_MACHINE
+
 pre-configure:
        ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 

Index: pkgsrc/lang/gcc12-libs/Makefile
diff -u pkgsrc/lang/gcc12-libs/Makefile:1.6 pkgsrc/lang/gcc12-libs/Makefile:1.7
--- pkgsrc/lang/gcc12-libs/Makefile:1.6 Fri Jun 28 17:55:10 2024
+++ pkgsrc/lang/gcc12-libs/Makefile     Tue Jan  7 19:55:37 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/06/28 17:55:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2025/01/07 19:55:37 riastradh Exp $
 
 GCC_PKGNAME=   gcc12
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC12_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc12 package so that with the dependence pattern
 ## '{gcc12,gcc12-libs}>=12.1.*' pkg_add will choose gcc12-libs over gcc12.
-PKGREVISION=   1
+PKGREVISION=   2
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Index: pkgsrc/lang/gcc12/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc12/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc12/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc12/patches/patch-gcc_Makefile.in:1.1 Thu Jun 16 15:43:55 2022
+++ pkgsrc/lang/gcc12/patches/patch-gcc_Makefile.in     Tue Jan  7 19:55:38 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2022/06/16 15:43:55 adam Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2025/01/07 19:55:38 riastradh 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
@@ -9,7 +10,7 @@ are found.
  # 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)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \