CVS commit: pkgsrc/lang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  4 14:22:14 UTC 2025

Modified Files:
        pkgsrc/lang/gcc10-libs: Makefile
        pkgsrc/lang/gcc12-libs: Makefile
        pkgsrc/lang/gcc13-libs: Makefile
        pkgsrc/lang/gcc14-gnat-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:
*: remove local SHLIB_EXT definition

Use centrally defined value instead.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc10-libs/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc12-libs/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc13-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc14-gnat-libs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc14-libs/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/gcc6-libs/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/gcc7-libs/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gcc8-libs/Makefile
cvs rdiff -u -r1.12 -r1.13 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.11 pkgsrc/lang/gcc10-libs/Makefile:1.12
--- pkgsrc/lang/gcc10-libs/Makefile:1.11        Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc10-libs/Makefile     Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.12 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=   gcc10
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \

Index: pkgsrc/lang/gcc12-libs/Makefile
diff -u pkgsrc/lang/gcc12-libs/Makefile:1.8 pkgsrc/lang/gcc12-libs/Makefile:1.9
--- pkgsrc/lang/gcc12-libs/Makefile:1.8 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc12-libs/Makefile     Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=   gcc12
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \

Index: pkgsrc/lang/gcc13-libs/Makefile
diff -u pkgsrc/lang/gcc13-libs/Makefile:1.4 pkgsrc/lang/gcc13-libs/Makefile:1.5
--- pkgsrc/lang/gcc13-libs/Makefile:1.4 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc13-libs/Makefile     Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=   gcc13
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \

Index: pkgsrc/lang/gcc14-gnat-libs/Makefile
diff -u pkgsrc/lang/gcc14-gnat-libs/Makefile:1.2 pkgsrc/lang/gcc14-gnat-libs/Makefile:1.3
--- pkgsrc/lang/gcc14-gnat-libs/Makefile:1.2    Sun Apr 27 09:37:07 2025
+++ pkgsrc/lang/gcc14-gnat-libs/Makefile        Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2025/04/27 09:37:07 dkazankov Exp $
+# $NetBSD: Makefile,v 1.3 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=           gcc14
 GCC14_DIST_VERSION=    14.2.0
@@ -35,12 +35,6 @@ LIBGCC_PREFIX=               ${LOCALBASE}/${LIBGCC_SU
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=           GCC_TARGET_MACHINE
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/list.txt
 TARGET_LIBDIR= ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib
 

Index: pkgsrc/lang/gcc14-libs/Makefile
diff -u pkgsrc/lang/gcc14-libs/Makefile:1.3 pkgsrc/lang/gcc14-libs/Makefile:1.4
--- pkgsrc/lang/gcc14-libs/Makefile:1.3 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc14-libs/Makefile     Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=   gcc14
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \

Index: pkgsrc/lang/gcc6-libs/Makefile
diff -u pkgsrc/lang/gcc6-libs/Makefile:1.21 pkgsrc/lang/gcc6-libs/Makefile:1.22
--- pkgsrc/lang/gcc6-libs/Makefile:1.21 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc6-libs/Makefile      Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.22 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=   gcc6
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -41,11 +41,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 CHECK_SHLIBS_SUPPORTED=        no
 
 .include "../../mk/bsd.prefs.mk"
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
 
 LIBRARY_FILES= ${WRKDIR}/lib_files
 

Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.17 pkgsrc/lang/gcc7-libs/Makefile:1.18
--- pkgsrc/lang/gcc7-libs/Makefile:1.17 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc7-libs/Makefile      Sun May  4 14:22:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.18 2025/05/04 14:22:13 wiz Exp $
 
 GCC_PKGNAME=   gcc7
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \

Index: pkgsrc/lang/gcc8-libs/Makefile
diff -u pkgsrc/lang/gcc8-libs/Makefile:1.19 pkgsrc/lang/gcc8-libs/Makefile:1.20
--- pkgsrc/lang/gcc8-libs/Makefile:1.19 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc8-libs/Makefile      Sun May  4 14:22:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2025/05/04 14:22:14 wiz Exp $
 
 GCC_PKGNAME=   gcc8
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \

Index: pkgsrc/lang/gcc9-libs/Makefile
diff -u pkgsrc/lang/gcc9-libs/Makefile:1.12 pkgsrc/lang/gcc9-libs/Makefile:1.13
--- pkgsrc/lang/gcc9-libs/Makefile:1.12 Tue Jan  7 19:56:45 2025
+++ pkgsrc/lang/gcc9-libs/Makefile      Sun May  4 14:22:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/01/07 19:56:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.13 2025/05/04 14:22:14 wiz Exp $
 
 GCC_PKGNAME=   gcc9
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -40,12 +40,6 @@ BUILD_DEFS+=         GCC_TARGET_MACHINE
 # for self-libraries.
 CHECK_SHLIBS_SUPPORTED=        no
 
-.if ${SHLIB_TYPE} == "dylib"
-SHLIB_EXT=     dylib
-.else
-SHLIB_EXT=     so
-.endif
-
 LIBRARY_FILES= ${WRKDIR}/lib_files
 
 GENERATE_PLIST+=       ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \