CVS commit: pkgsrc/lang

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

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

Modified Files:
        pkgsrc/lang/gcc10-libs: Makefile
        pkgsrc/lang/gcc12-libs: Makefile
        pkgsrc/lang/gcc13-libs: Makefile
        pkgsrc/lang/gcc14-libs: Makefile
        pkgsrc/lang/gcc6-libs: Makefile
        pkgsrc/lang/gcc7-libs: Makefile
        pkgsrc/lang/gcc8-libs: Makefile
        pkgsrc/lang/gcc9-libs: Makefile

Log Message:
lang/gccN-libs: Disable REQUIRES/PROVIDES analysis.

This is a stop-gap measure to work around:

PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong for
self-libraries

It should be removed once the REQUIRES/PROVIDES analysis is fixed.

Since the REQUIRES/PROVIDES analysis is already done for the
underlying lang/gccN package, and the transformation from lang/gccN
to lang/gccN-libs is straightforward, disabling this check should be
reasonably low-risk -- currently the lang/gccN-libs packages are
outright broken and unusable with pkgtools/pkg_install.

This doesn't change the content of the package, only the metadata, so
no need for recursive revbump of dependent packages.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc10-libs/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc12-libs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc13-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc14-libs/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/gcc6-libs/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/gcc7-libs/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/gcc8-libs/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc9-libs/Makefile

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-libs/Makefile
diff -u pkgsrc/lang/gcc10-libs/Makefile:1.10 pkgsrc/lang/gcc10-libs/Makefile:1.11
--- pkgsrc/lang/gcc10-libs/Makefile:1.10        Tue Jan  7 19:54:31 2025
+++ pkgsrc/lang/gcc10-libs/Makefile     Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2025/01/07 19:54:31 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2025/01/07 19:56:45 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=   4
+PKGREVISION=   5
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else

Index: pkgsrc/lang/gcc12-libs/Makefile
diff -u pkgsrc/lang/gcc12-libs/Makefile:1.7 pkgsrc/lang/gcc12-libs/Makefile:1.8
--- pkgsrc/lang/gcc12-libs/Makefile:1.7 Tue Jan  7 19:55:37 2025
+++ pkgsrc/lang/gcc12-libs/Makefile     Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/01/07 19:55:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/07 19:56:45 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=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else

Index: pkgsrc/lang/gcc13-libs/Makefile
diff -u pkgsrc/lang/gcc13-libs/Makefile:1.3 pkgsrc/lang/gcc13-libs/Makefile:1.4
--- pkgsrc/lang/gcc13-libs/Makefile:1.3 Tue Jan  7 19:55:52 2025
+++ pkgsrc/lang/gcc13-libs/Makefile     Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2025/01/07 19:55:52 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2025/01/07 19:56:45 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=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else

Index: pkgsrc/lang/gcc14-libs/Makefile
diff -u pkgsrc/lang/gcc14-libs/Makefile:1.2 pkgsrc/lang/gcc14-libs/Makefile:1.3
--- pkgsrc/lang/gcc14-libs/Makefile:1.2 Tue Jan  7 19:56:06 2025
+++ pkgsrc/lang/gcc14-libs/Makefile     Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2025/01/07 19:56:06 riastradh Exp $
+# $NetBSD: Makefile,v 1.3 2025/01/07 19:56:45 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=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else

Index: pkgsrc/lang/gcc6-libs/Makefile
diff -u pkgsrc/lang/gcc6-libs/Makefile:1.20 pkgsrc/lang/gcc6-libs/Makefile:1.21
--- pkgsrc/lang/gcc6-libs/Makefile:1.20 Thu Oct  5 05:20:10 2023
+++ pkgsrc/lang/gcc6-libs/Makefile      Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/10/05 05:20:10 gutteridge Exp $
+# $NetBSD: Makefile,v 1.21 2025/01/07 19:56:45 riastradh Exp $
 
 GCC_PKGNAME=   gcc6
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC6_DIST
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc6 package so that with the dependence pattern
 ## '{gcc6,gcc6-libs}>=6.1.*' pkg_add will choose gcc6-libs over gcc6.
-PKGREVISION=   10
+PKGREVISION=   11
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .include "../../mk/bsd.prefs.mk"
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib

Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.16 pkgsrc/lang/gcc7-libs/Makefile:1.17
--- pkgsrc/lang/gcc7-libs/Makefile:1.16 Tue Jun  6 12:41:43 2023
+++ pkgsrc/lang/gcc7-libs/Makefile      Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/06/06 12:41:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2025/01/07 19:56:45 riastradh Exp $
 
 GCC_PKGNAME=   gcc7
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC7_DIST
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc7 package so that with the dependence pattern
 ## '{gcc7,gcc7-libs}>=7.5.*' pkg_add will choose gcc7-libs over gcc7.
-PKGREVISION=   7
+PKGREVISION=   8
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else

Index: pkgsrc/lang/gcc8-libs/Makefile
diff -u pkgsrc/lang/gcc8-libs/Makefile:1.18 pkgsrc/lang/gcc8-libs/Makefile:1.19
--- pkgsrc/lang/gcc8-libs/Makefile:1.18 Thu Oct  5 05:15:36 2023
+++ pkgsrc/lang/gcc8-libs/Makefile      Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/10/05 05:15:36 gutteridge Exp $
+# $NetBSD: Makefile,v 1.19 2025/01/07 19:56:45 riastradh Exp $
 
 GCC_PKGNAME=   gcc8
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC8_DIST
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc8 package so that with the dependence pattern
 ## '{gcc8,gcc8-libs}>=8.2.*' pkg_add will choose gcc8-libs over gcc8.
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else

Index: pkgsrc/lang/gcc9-libs/Makefile
diff -u pkgsrc/lang/gcc9-libs/Makefile:1.11 pkgsrc/lang/gcc9-libs/Makefile:1.12
--- pkgsrc/lang/gcc9-libs/Makefile:1.11 Thu Oct  5 05:20:10 2023
+++ pkgsrc/lang/gcc9-libs/Makefile      Tue Jan  7 19:56:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/10/05 05:20:10 gutteridge Exp $
+# $NetBSD: Makefile,v 1.12 2025/01/07 19:56:45 riastradh Exp $
 
 GCC_PKGNAME=   gcc9
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC9_DIST
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc9 package so that with the dependence pattern
 ## '{gcc9,gcc9-libs}>=9.2.*' pkg_add will choose gcc9-libs over gcc9.
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -36,6 +36,10 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
+# Workaround for PR pkg/58966: mk: REQUIRES/PROVIDES analysis is wrong
+# for self-libraries.
+CHECK_SHLIBS_SUPPORTED=        no
+
 .if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=     dylib
 .else