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

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

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Tue Jul  1 20:34:51 UTC 2025

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

Log Message:
lang/gcc13-gnat-libs: fix var name cross usage with gcc


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc13-gnat-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc13-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/gcc13-gnat-libs/Makefile
diff -u pkgsrc/lang/gcc13-gnat-libs/Makefile:1.3 pkgsrc/lang/gcc13-gnat-libs/Makefile:1.4
--- pkgsrc/lang/gcc13-gnat-libs/Makefile:1.3    Wed Jun 11 14:17:31 2025
+++ pkgsrc/lang/gcc13-gnat-libs/Makefile        Tue Jul  1 20:34:51 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2025/06/11 14:17:31 dkazankov Exp $
+# $NetBSD: Makefile,v 1.4 2025/07/01 20:34:51 dkazankov Exp $
 
 GCC_PKGNAME=           gcc13
-GCC13_DIST_VERSION=    13.3.0
+GCC_DIST_VERSION=      13.3.0
 
-DISTNAME=      gcc-${GCC13_DIST_VERSION}
-PKGNAME=       ${GCC_PKGNAME}-gnat-libs-${GCC13_DIST_VERSION}
+DISTNAME=      gcc-${GCC_DIST_VERSION}
+PKGNAME=       ${GCC_PKGNAME}-gnat-libs-${GCC_DIST_VERSION}
 ## 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.
@@ -22,8 +22,8 @@ USE_TOOLS+=   pax
 
 CHECK_RELRO_SUPPORTED= no
 
-## Depend on exactly ${GCC13_DIST_VERSION}.
-TOOL_DEPENDS+=         ${GCC_PKGNAME}-gnat-${GCC13_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc13-gnat
+## Depend on exactly ${GCC_DIST_VERSION}.
+TOOL_DEPENDS+=         ${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc13-gnat
 TOOL_DEPENDS+=         patchelf-[0-9]*:../../devel/patchelf
 
 .include "../../mk/bsd.prefs.mk"
@@ -44,7 +44,7 @@ GENERATE_PLIST+=      cd ${DESTDIR}${PREFIX}  
                        ${ECHO} '@pkgdir ${TARGET_LIBDIR}' ;
 
 do-build:
-       ${PKG_INFO} -qL '${GCC_PKGNAME}-gnat-${GCC13_DIST_VERSION}*' | \
+       ${PKG_INFO} -qL '${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}*' | \
        ${SED} -n -e's,^${LIBGCC_PREFIX}/,,p' | \
        ${SED} -n -e'/lib\/.*\/crt.*\.o/p' \
                -e'/lib\/.*\/adalib\/lib.*\.so.*/p' \

Index: pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk:1.2 pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk:1.3
--- pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk:1.2       Sun Feb 16 10:10:22 2025
+++ pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk   Tue Jul  1 20:34:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2025/02/16 10:10:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/07/01 20:34:51 dkazankov Exp $
 
 BUILDLINK_TREE+=       gcc13-gnat-libs
 
@@ -10,18 +10,19 @@ BUILDLINK_API_DEPENDS.gcc13-gnat-libs+=     
 .else
 BUILDLINK_API_DEPENDS.gcc13-gnat-libs+=        {gcc13-gnat,gcc13-gnat-libs}>=13.2.0
 .endif
-BUILDLINK_PKGSRCDIR.gcc13-gnat-libs=   ../../lang/gcc13-gnat-libs
+BUILDLINK_PKGSRCDIR.gcc13-gnat-libs?=  ../../lang/gcc13-gnat-libs
 BUILDLINK_DEPMETHOD.gcc13-gnat-libs?=  full
 
-GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
+#GCC_TARGET_MACHINE?=  ${MACHINE_GNU_PLATFORM}
 
-TARGET_LIBDIR.gcc13-gnat-libs= ${PREFIX}/gcc13-gnat/${GCC_TARGET_MACHINE}/lib
+#TARGET_LIBDIR.gcc13-gnat-libs=        ${PREFIX}/gcc13-gnat/${GCC_TARGET_MACHINE}/lib
 
-BUILDLINK_PASSTHRU_DIRS+=      ${TARGET_LIBDIR.gcc13-gnat-libs}
+#BUILDLINK_PASSTHRU_DIRS+=     ${TARGET_LIBDIR.gcc13-gnat-libs}
 
-BUILDLINK_FILES.gcc13-gnat-libs=       #empty
-BUILDLINK_AUTO_VARS.gcc13-gnat-libs=   no
-BUILDLINK_AUTO_DIRS.gcc13-gnat-libs=   no
+#BUILDLINK_FILES.gcc13-gnat-libs=      #empty
+#BUILDLINK_AUTO_VARS.gcc13-gnat-libs=  no
+#BUILDLINK_AUTO_DIRS.gcc13-gnat-libs=  no
+BUILDLINK_CONTENTS_FILTER.gcc13-gnat-libs=     ${FALSE}
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"