CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Taylor R Campbell" <riastradh%netbsd.org@localhost>
Date: Tue, 7 Jan 2025 19:55:52 +0000

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

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

Log Message:
lang/gcc13*: 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.3 -r1.4 pkgsrc/lang/gcc13/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc13/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc13/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc13-gnat/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc13-gnat/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc13-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc13/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/gcc13/Makefile
diff -u pkgsrc/lang/gcc13/Makefile:1.3 pkgsrc/lang/gcc13/Makefile:1.4
--- pkgsrc/lang/gcc13/Makefile:1.3      Fri Jun  7 10:28:55 2024
+++ pkgsrc/lang/gcc13/Makefile  Tue Jan  7 19:55:52 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2024/06/07 10:28:55 adam Exp $
+# $NetBSD: Makefile,v 1.4 2025/01/07 19:55:52 riastradh Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC13_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc13-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) - 13.0 Release Series
 
 LANGS=         c

Index: pkgsrc/lang/gcc13/Makefile.common
diff -u pkgsrc/lang/gcc13/Makefile.common:1.8 pkgsrc/lang/gcc13/Makefile.common:1.9
--- pkgsrc/lang/gcc13/Makefile.common:1.8       Wed Jul 24 23:01:28 2024
+++ pkgsrc/lang/gcc13/Makefile.common   Tue Jan  7 19:55:52 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2024/07/24 23:01:28 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.9 2025/01/07 19:55:52 riastradh Exp $
 # used by lang/gcc13-libjit/Makefile
 
 GCC_PKGNAME=           gcc13
@@ -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/gcc13/distinfo
diff -u pkgsrc/lang/gcc13/distinfo:1.4 pkgsrc/lang/gcc13/distinfo:1.5
--- pkgsrc/lang/gcc13/distinfo:1.4      Sun Dec 15 03:07:57 2024
+++ pkgsrc/lang/gcc13/distinfo  Tue Jan  7 19:55:52 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/12/15 03:07:57 brook Exp $
+$NetBSD: distinfo,v 1.5 2025/01/07 19:55:52 riastradh Exp $
 
 BLAKE2s (gcc-13.3.0.diff) = 9b002a64761cf2f2a6a9a8c8decff8408380c0fe94c2d3013e4d84299bacf814
 SHA512 (gcc-13.3.0.diff) = 6165b6201f4ef94ee254ea40410911f5e5e1a05d80d4da2fce90b3db94000c3d5c5a28c9a4ad1a43387faae68d94fbef8e4d24e1ff049b9c0014c00f6f50757b
@@ -10,7 +10,7 @@ BLAKE2s (isl-0.24.tar.xz) = a3013b0d39b7
 SHA512 (isl-0.24.tar.xz) = ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
 Size (isl-0.24.tar.xz) = 1930956 bytes
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
-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/gcc13-gnat/Makefile
diff -u pkgsrc/lang/gcc13-gnat/Makefile:1.2 pkgsrc/lang/gcc13-gnat/Makefile:1.3
--- pkgsrc/lang/gcc13-gnat/Makefile:1.2 Fri Mar  8 13:25:12 2024
+++ pkgsrc/lang/gcc13-gnat/Makefile     Tue Jan  7 19:55:52 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2024/03/08 13:25:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/01/07 19:55:52 riastradh Exp $
 
 GCC_PKGNAME=gcc13
 .include "../../lang/${GCC_PKGNAME}/version.mk"
 
 PKGNAME=       ${GCC_PKGNAME}-gnat-${GCC13_DIST_VERSION}
+PKGREVISION=   1
 COMMENT=       GNAT Compiler and Ada tools
 DISTNAME=      gcc-${GCC13_DIST_VERSION}
 CATEGORIES=    lang
@@ -180,6 +181,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
+
 CTF_FILES_SKIP+=       */gengtype      # CPU limit exceeded
 
 TEST_TARGET=   -j ${MAKE_JOBS} -k check || ${TRUE}

Index: pkgsrc/lang/gcc13-gnat/distinfo
diff -u pkgsrc/lang/gcc13-gnat/distinfo:1.3 pkgsrc/lang/gcc13-gnat/distinfo:1.4
--- pkgsrc/lang/gcc13-gnat/distinfo:1.3 Tue Dec 24 14:15:49 2024
+++ pkgsrc/lang/gcc13-gnat/distinfo     Tue Jan  7 19:55:52 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2024/12/24 14:15:49 mef Exp $
+$NetBSD: distinfo,v 1.4 2025/01/07 19:55:52 riastradh Exp $
 
 BLAKE2s (gcc-13.3.0.tar.xz) = d204b8987b4780b569f28226cbfff34ae27124e529857c36ff90d5d40ef0b511
 SHA512 (gcc-13.3.0.tar.xz) = ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
 Size (gcc-13.3.0.tar.xz) = 87909952 bytes
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
-SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
+SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
 SHA1 (patch-gcc_ada_Makefile.rtl) = 59883834af5303b2e86a79d0df30a1a220ced895
 SHA1 (patch-gcc_ada_adaint.c) = 465b3e3d6db193b2729f1d4e1c74eefcc3dc85bf
 SHA1 (patch-gcc_ada_adaint.h) = 57befa67b18f97345db05672f1e53e8ec70e1935

Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_Makefile.in:1.1    Fri Mar  8 12:02:33 2024
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_Makefile.in        Tue Jan  7 19:55:52 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2024/03/08 12:02:33 wiz Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2025/01/07 19:55:52 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/\" \

Index: pkgsrc/lang/gcc13-libs/Makefile
diff -u pkgsrc/lang/gcc13-libs/Makefile:1.2 pkgsrc/lang/gcc13-libs/Makefile:1.3
--- pkgsrc/lang/gcc13-libs/Makefile:1.2 Tue Jun  6 12:41:42 2023
+++ pkgsrc/lang/gcc13-libs/Makefile     Tue Jan  7 19:55:52 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/06/06 12:41:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.3 2025/01/07 19:55:52 riastradh Exp $
 
 GCC_PKGNAME=   gcc13
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC13_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc13 package so that with the dependence pattern
 ## '{gcc13,gcc13-libs}>=13.1.*' pkg_add will choose gcc13-libs over gcc13.
-PKGREVISION=   1
+PKGREVISION=   2
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Index: pkgsrc/lang/gcc13/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc13/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc13/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc13/patches/patch-gcc_Makefile.in:1.1 Wed May  3 20:03:09 2023
+++ pkgsrc/lang/gcc13/patches/patch-gcc_Makefile.in     Tue Jan  7 19:55:52 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2023/05/03 20:03:09 wiz Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2025/01/07 19:55:52 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/\" \

Prev by Date: CVS commit: pkgsrc/lang
Next by Date: CVS commit: pkgsrc/lang
Previous by Thread: CVS commit: pkgsrc/lang
Next by Thread: CVS commit: pkgsrc/lang
Indexes:

Home | Main Index | Thread Index | Old Index