CVS commit: pkgsrc/lang/gcc10

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 10 11:57:07 UTC 2025

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

Log Message:
lang/gcc10: Fix comment and nix space in LINK_LIBGCC_SPEC rpath flag.

Got this in all the other gcc versions but missed this one.  The
comment change is not particularly significant but let's make it
consistent between the parallel patches of gcc versions.

Revbump because this space change is significant on some platforms
and I don't know offhand whether it toggles between buildable or
not-buildable, or broken and working; in the latter case a revbump is
required.

PKGREVISION of gcc10 remains below PKGREVISION of gcc10-libs because
gcc10-libs got an extra revbump recently for the REQUIRES/PROVIDES
issue.

PR pkg/48740: lang/gcc44 to gcc46 linker fails because of whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/gcc10/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gcc10/distinfo
cvs rdiff -u -r1.3 -r1.4 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.26 pkgsrc/lang/gcc10/Makefile:1.27
--- pkgsrc/lang/gcc10/Makefile:1.26     Tue Jan  7 19:54:31 2025
+++ pkgsrc/lang/gcc10/Makefile  Fri Jan 10 11:57:07 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2025/01/07 19:54:31 riastradh Exp $
+# $NetBSD: Makefile,v 1.27 2025/01/10 11:57:07 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=   3
+PKGREVISION=   4
 
 COMMENT=       The GNU Compiler Collection (GCC) - 10.0 Release Series
 

Index: pkgsrc/lang/gcc10/distinfo
diff -u pkgsrc/lang/gcc10/distinfo:1.19 pkgsrc/lang/gcc10/distinfo:1.20
--- pkgsrc/lang/gcc10/distinfo:1.19     Tue Jan  7 19:54:31 2025
+++ pkgsrc/lang/gcc10/distinfo  Fri Jan 10 11:57:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2025/01/07 19:54:31 riastradh Exp $
+$NetBSD: distinfo,v 1.20 2025/01/10 11:57:07 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) = ae324c5df0b5c4ba4ebae280039594043bb34e12
+SHA1 (patch-gcc_Makefile.in) = c04bfc4d0b2b0f94e8d6b6f6367a7b9cb941c354
 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/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in:1.3 pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in:1.4
--- pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in:1.3 Tue Jan  7 19:54:31 2025
+++ pkgsrc/lang/gcc10/patches/patch-gcc_Makefile.in     Fri Jan 10 11:57:07 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.3 2025/01/07 19:54:31 riastradh Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.4 2025/01/10 11:57:07 riastradh Exp $
 
-Add gcc libdir to 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).
 
 Add a hack to increase the stack for genautomata on QNX.
 
@@ -11,7 +12,7 @@ Add a hack to increase the stack for gen
  # Language-independent files.
  
  DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/@GCC_TARGET_MACHINE@/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/\" \