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:54:32 +0000

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:54:31 UTC 2025

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

Log Message:
lang/gcc10*: 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.25 -r1.26 pkgsrc/lang/gcc10/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc10/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/gcc10/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc10-aux/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc10-aux/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc10-aux/patches/patch-gcc_Makefile.in
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc10-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc10/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/gcc10/Makefile
diff -u pkgsrc/lang/gcc10/Makefile:1.25 pkgsrc/lang/gcc10/Makefile:1.26
--- pkgsrc/lang/gcc10/Makefile:1.25     Mon Apr  1 18:08:48 2024
+++ pkgsrc/lang/gcc10/Makefile  Tue Jan  7 19:54:31 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2024/04/01 18:08:48 js Exp $
+# $NetBSD: Makefile,v 1.26 2025/01/07 19:54:31 riastradh Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC10_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc10-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       The GNU Compiler Collection (GCC) - 10.0 Release Series
 

Index: pkgsrc/lang/gcc10/Makefile.common
diff -u pkgsrc/lang/gcc10/Makefile.common:1.10 pkgsrc/lang/gcc10/Makefile.common:1.11
--- pkgsrc/lang/gcc10/Makefile.common:1.10      Wed Apr 24 10:56:06 2024
+++ pkgsrc/lang/gcc10/Makefile.common   Tue Jan  7 19:54:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2024/04/24 10:56:06 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.11 2025/01/07 19:54:31 riastradh Exp $
 # used by lang/gcc10-libjit/Makefile
 
 GCC_PKGNAME=           gcc10
@@ -138,6 +138,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/gcc10/distinfo
diff -u pkgsrc/lang/gcc10/distinfo:1.18 pkgsrc/lang/gcc10/distinfo:1.19
--- pkgsrc/lang/gcc10/distinfo:1.18     Mon Apr  1 18:08:48 2024
+++ pkgsrc/lang/gcc10/distinfo  Tue Jan  7 19:54:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2024/04/01 18:08:48 js Exp $
+$NetBSD: distinfo,v 1.19 2025/01/07 19:54:31 riastradh Exp $
 
 BLAKE2s (gcc-10.5.0.tar.xz) = af4a8b262d9d4e534e8e1c311897e68e7d64f147ad1eed42e77f9674da188bf3
 SHA512 (gcc-10.5.0.tar.xz) = d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd
@@ -8,7 +8,7 @@ SHA512 (isl-0.16.1.tar.bz2) = c188667a84
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
 SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
-SHA1 (patch-gcc_Makefile.in) = a47571d8340702d1a86d0dfb7df654280c6a6ee6
+SHA1 (patch-gcc_Makefile.in) = ae324c5df0b5c4ba4ebae280039594043bb34e12
 SHA1 (patch-gcc_config.gcc) = 4767d5b16794f4485879ed10e172cb2f86bc0777
 SHA1 (patch-gcc_config.host) = 8920ce841f6088b365c9b590e3ea9535bd880b40
 SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 87185f5c2e2dbe4195cb19fe6213d2d616d5519b

Index: pkgsrc/lang/gcc10-aux/Makefile
diff -u pkgsrc/lang/gcc10-aux/Makefile:1.7 pkgsrc/lang/gcc10-aux/Makefile:1.8
--- pkgsrc/lang/gcc10-aux/Makefile:1.7  Tue Aug 15 13:49:17 2023
+++ pkgsrc/lang/gcc10-aux/Makefile      Tue Jan  7 19:54:31 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2023/08/15 13:49:17 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/07 19:54:31 riastradh Exp $
 
 GCC_PKGNAME=           gcc10-aux
-PKGREVISION=           1
+PKGREVISION=           2
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC10_DIST_VERSION}
@@ -184,6 +184,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
 
 pre-configure:

Index: pkgsrc/lang/gcc10-aux/distinfo
diff -u pkgsrc/lang/gcc10-aux/distinfo:1.1 pkgsrc/lang/gcc10-aux/distinfo:1.2
--- pkgsrc/lang/gcc10-aux/distinfo:1.1  Sun Mar 13 08:34:04 2022
+++ pkgsrc/lang/gcc10-aux/distinfo      Tue Jan  7 19:54:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2022/03/13 08:34:04 nia Exp $
+$NetBSD: distinfo,v 1.2 2025/01/07 19:54:31 riastradh Exp $
 
 BLAKE2s (gcc-10.3.0.tar.xz) = 6d7c42f9386e5e32a3148122471cb207e5f65d7b5f53b3c9adba2d45a4f28715
 SHA512 (gcc-10.3.0.tar.xz) = 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -8,7 +8,7 @@ SHA512 (isl-0.16.1.tar.bz2) = c188667a84
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
 SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
-SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
+SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
 SHA1 (patch-gcc_ada_Makefile.rtl) = 1b6a18dce5ffe752be942f6e328d487692f3b33a
 SHA1 (patch-gcc_ada_adaint.c) = 465b3e3d6db193b2729f1d4e1c74eefcc3dc85bf
 SHA1 (patch-gcc_ada_adaint.h) = 57befa67b18f97345db05672f1e53e8ec70e1935

Index: pkgsrc/lang/gcc10-aux/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc10-aux/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc10-aux/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc10-aux/patches/patch-gcc_Makefile.in:1.1     Sun Mar 13 08:34:04 2022
+++ pkgsrc/lang/gcc10-aux/patches/patch-gcc_Makefile.in Tue Jan  7 19:54:31 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2022/03/13 08:34:04 nia Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2025/01/07 19:54:31 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/gcc10-libs/Makefile
diff -u pkgsrc/lang/gcc10-libs/Makefile:1.9 pkgsrc/lang/gcc10-libs/Makefile:1.10
--- pkgsrc/lang/gcc10-libs/Makefile:1.9 Mon Apr  1 18:08:48 2024
+++ pkgsrc/lang/gcc10-libs/Makefile     Tue Jan  7 19:54:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/04/01 18:08:48 js Exp $
+# $NetBSD: Makefile,v 1.10 2025/01/07 19:54:31 riastradh Exp $
 
 GCC_PKGNAME=   gcc10
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC10_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc10 package so that with the dependence pattern
 ## '{gcc10,gcc10-libs}>=10.2.*' pkg_add will choose gcc10-libs over gcc10.
-PKGREVISION=   3
+PKGREVISION=   4
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Index: pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in:1.2 pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in:1.3
--- pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in:1.2 Mon Apr  1 14:33:57 2024
+++ pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in     Tue Jan  7 19:54:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.2 2024/04/01 14:33:57 js Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.3 2025/01/07 19:54:31 riastradh Exp $
 
 Add gcc libdir to programs' rpath so that _this gcc's_ support libraries
 are found.
@@ -11,7 +11,7 @@ Add a hack to increase the stack for gen
  # 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/devel/py-syrupy
Next by Date: CVS commit: pkgsrc/lang
Previous by Thread: CVS commit: pkgsrc/devel/py-syrupy
Next by Thread: CVS commit: pkgsrc/lang
Indexes:

Home | Main Index | Thread Index | Old Index