CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:56:07 UTC 2025

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

Log Message:
lang/gcc14*: 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.1 -r1.2 pkgsrc/lang/gcc14/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc14/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc14/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc14-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc14/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/gcc14/Makefile
diff -u pkgsrc/lang/gcc14/Makefile:1.1 pkgsrc/lang/gcc14/Makefile:1.2
--- pkgsrc/lang/gcc14/Makefile:1.1      Fri Jun 28 18:35:16 2024
+++ pkgsrc/lang/gcc14/Makefile  Tue Jan  7 19:56:07 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2024/06/28 18:35:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/01/07 19:56:07 riastradh Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC14_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc14-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) - 14.0 Release Series
 
 LANGS=         c

Index: pkgsrc/lang/gcc14/Makefile.common
diff -u pkgsrc/lang/gcc14/Makefile.common:1.4 pkgsrc/lang/gcc14/Makefile.common:1.5
--- pkgsrc/lang/gcc14/Makefile.common:1.4       Sun Sep 29 16:51:55 2024
+++ pkgsrc/lang/gcc14/Makefile.common   Tue Jan  7 19:56:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2024/09/29 16:51:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2025/01/07 19:56:07 riastradh Exp $
 # used by lang/gcc14-libjit/Makefile
 
 GCC_PKGNAME=           gcc14
@@ -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/gcc14/distinfo
diff -u pkgsrc/lang/gcc14/distinfo:1.5 pkgsrc/lang/gcc14/distinfo:1.6
--- pkgsrc/lang/gcc14/distinfo:1.5      Sun Dec 15 03:12:17 2024
+++ pkgsrc/lang/gcc14/distinfo  Tue Jan  7 19:56:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2024/12/15 03:12:17 brook Exp $
+$NetBSD: distinfo,v 1.6 2025/01/07 19:56:07 riastradh Exp $
 
 BLAKE2s (gcc-14.2.0.diff) = 48bde4d7aae57211844aca294c120caaebdb1b1ecabfd0349aa7e27d11ef0042
 SHA512 (gcc-14.2.0.diff) = c96d92289492d76f6e4e6376148c53d7e962fd15d03b1ecfe16f8036a0ff0c1e9277bf00566ecfe0d54765a679ce7d7470f6e696f8e3fe7b419000b924260fcf
@@ -9,7 +9,7 @@ Size (gcc-14.2.0.tar.xz) = 92306460 byte
 BLAKE2s (isl-0.24.tar.xz) = a3013b0d39b7fe68a1b3e15dc7e925b347d555348ee946a80f5319a76973cd61
 SHA512 (isl-0.24.tar.xz) = ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
 Size (isl-0.24.tar.xz) = 1930956 bytes
-SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
+SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
 SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827
 SHA1 (patch-gcc_config_arm_arm.h) = 9d554349869d67d6393552c33a7824f0dd53cb11

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

Index: pkgsrc/lang/gcc14/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc14/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc14/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc14/patches/patch-gcc_Makefile.in:1.1 Fri Jun 28 18:35:16 2024
+++ pkgsrc/lang/gcc14/patches/patch-gcc_Makefile.in     Tue Jan  7 19:56:07 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2024/06/28 18:35:16 wiz Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2025/01/07 19:56:07 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/\" \