CVS commit: pkgsrc/lang/gcc14-gnat-libs

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Wed Jul  9 17:27:05 UTC 2025

Modified Files:
        pkgsrc/lang/gcc14-gnat-libs: Makefile buildlink3.mk

Log Message:
lang/gcc14-gnat-libs: clean and simplify package

* Remove definition of a large number of unnecessary variables
* Remove unnecessary buildlinks


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc14-gnat-libs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc14-gnat-libs/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc14-gnat-libs/Makefile
diff -u pkgsrc/lang/gcc14-gnat-libs/Makefile:1.7 pkgsrc/lang/gcc14-gnat-libs/Makefile:1.8
--- pkgsrc/lang/gcc14-gnat-libs/Makefile:1.7    Wed Jul  2 06:31:34 2025
+++ pkgsrc/lang/gcc14-gnat-libs/Makefile        Wed Jul  9 17:27:05 2025
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2025/07/02 06:31:34 dkazankov Exp $
+# $NetBSD: Makefile,v 1.8 2025/07/09 17:27:05 dkazankov Exp $
 
-GCC_PKGNAME=           gcc14
-GCC_DIST_VERSION=      14.3.0
+GNAT_PKGNAME=  gcc14-gnat
 
-DISTNAME=      gcc-${GCC_DIST_VERSION}
-PKGNAME=       ${GCC_PKGNAME}-gnat-libs-${GCC_DIST_VERSION}
+DISTNAME=      gcc-${PKGVERSION_NOREV}
+PKGNAME=       ${GNAT_PKGNAME}-libs-14.3.0
 
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc14-gnat package so that with the dependence pattern
 ## '{gcc14-gnat,gcc14-gnat-libs}>=14.1.*' pkg_add will choose gcc14-gnat-libs over gcc14-gnat.
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
@@ -25,29 +24,24 @@ USE_TOOLS+= pax
 CHECK_RELRO_SUPPORTED= no
 
 ## Depend on exactly ${GCC_DIST_VERSION}.
-TOOL_DEPENDS+=         ${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc14-gnat
+TOOL_DEPENDS+=         ${GNAT_PKGNAME}-${PKGVERSION_NOREV}{,nb[0-9]*}:../../lang/gcc14-gnat
 TOOL_DEPENDS+=         patchelf-[0-9]*:../../devel/patchelf
 
 .include "../../mk/bsd.prefs.mk"
 
-LIBGCC_SUBPREFIX=      ${GCC_PKGNAME}-gnat
-LIBGCC_PREFIX=         ${LOCALBASE}/${LIBGCC_SUBPREFIX}
-GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
-BUILD_DEFS+=           GCC_TARGET_MACHINE
-
 # Workaround for PR pkg/58966
 CHECK_SHLIBS_SUPPORTED=        no
 
 LIBRARY_FILES= ${WRKDIR}/list.txt
-TARGET_LIBDIR= ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib
+TARGET_LIBDIR= ${GNAT_PKGNAME}/${MACHINE_GNU_PLATFORM}/lib
 
-GENERATE_PLIST+=       cd ${DESTDIR}${PREFIX}  \
-                       ${FIND} ${TARGET_LIBDIR} \( -type f -or -type l \) -print | ${SORT} || \
-                       ${ECHO} '@pkgdir ${TARGET_LIBDIR}' ;
+GENERATE_PLIST+=       cd ${DESTDIR}${PREFIX} && \
+                       ${FIND} ${GNAT_PKGNAME} \( -type f -or -type l \) -print | ${SORT};
+GENERATE_PLIST+=       ${ECHO} '@pkgdir ${TARGET_LIBDIR}';
 
 do-build:
-       ${PKG_INFO} -qL '${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}*' | \
-       ${SED} -n -e's,^${LIBGCC_PREFIX}/,,p' | \
+       ${PKG_INFO} -qL '${GNAT_PKGNAME}-${PKGVERSION_NOREV}*' | \
+       ${SED} -n -e's,^${PREFIX}/${GNAT_PKGNAME}/,,p' | \
        ${SED} -n -e'/lib\/.*\/crt.*\.o/p' \
                -e'/lib\/.*\/adalib\/lib.*\.so.*/p' \
                -e'/.*\/ada_target_properties/p' \
@@ -55,15 +49,15 @@ do-build:
                ${LIBRARY_FILES}
 
 do-install:
-       ${TEST} -d ${DESTDIR}${LOCALBASE}/${TARGET_LIBDIR} || \
-               ${MKDIR} ${DESTDIR}${LOCALBASE}/${TARGET_LIBDIR}
-       cd ${LIBGCC_PREFIX} && \
+       ${TEST} -d ${DESTDIR}${PREFIX}/${TARGET_LIBDIR} || \
+               ${MKDIR} ${DESTDIR}${PREFIX}/${TARGET_LIBDIR}
+       cd ${PREFIX}/${GNAT_PKGNAME} && \
                ${PAX} -rw -s '/^\(.*\/\)\([^\/]*\)/\2/' \
-               ${DESTDIR}${LOCALBASE}/${TARGET_LIBDIR} <${LIBRARY_FILES}
+               ${DESTDIR}${PREFIX}/${TARGET_LIBDIR} <${LIBRARY_FILES}
        ${ECHO} "Patching RPATH in destination libraries..."
-       cd ${DESTDIR}${LOCALBASE} && \
+       cd ${DESTDIR}${PREFIX} && \
                ${FIND} ${TARGET_LIBDIR} \( -name \*.so\* -and -type f \) -print \
-                       -exec patchelf --force-rpath --set-rpath '$$ORIGIN:${LOCALBASE}/${TARGET_LIBDIR}' {} \;
+                       -exec patchelf --force-rpath --set-rpath '$$ORIGIN:${PREFIX}/${TARGET_LIBDIR}' {} \;
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/lang/gcc14-gnat-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc14-gnat-libs/buildlink3.mk:1.3 pkgsrc/lang/gcc14-gnat-libs/buildlink3.mk:1.4
--- pkgsrc/lang/gcc14-gnat-libs/buildlink3.mk:1.3       Tue Jul  1 20:44:11 2025
+++ pkgsrc/lang/gcc14-gnat-libs/buildlink3.mk   Wed Jul  9 17:27:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2025/07/01 20:44:11 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/07/09 17:27:05 dkazankov Exp $
 
 BUILDLINK_TREE+=       gcc14-gnat-libs
 
@@ -13,15 +13,6 @@ BUILDLINK_API_DEPENDS.gcc14-gnat-libs+=      
 BUILDLINK_PKGSRCDIR.gcc14-gnat-libs?=  ../../lang/gcc14-gnat-libs
 BUILDLINK_DEPMETHOD.gcc14-gnat-libs?=  full
 
-#GCC_TARGET_MACHINE?=  ${MACHINE_GNU_PLATFORM}
-
-#TARGET_LIBDIR.gcc14-gnat-libs=        ${PREFIX}/gcc14-gnat/${GCC_TARGET_MACHINE}/lib
-
-#BUILDLINK_PASSTHRU_DIRS+=     ${TARGET_LIBDIR.gcc14-gnat-libs}
-
-#BUILDLINK_FILES.gcc14-gnat-libs=      #empty
-#BUILDLINK_AUTO_VARS.gcc14-gnat-libs=  no
-#BUILDLINK_AUTO_DIRS.gcc14-gnat-libs=  no
 BUILDLINK_CONTENTS_FILTER.gcc14-gnat-libs=     ${FALSE}
 
 .include "../../mk/dlopen.buildlink3.mk"