CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb 16 10:10:22 UTC 2025

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

Log Message:
gcc13-gnat*: improvements from Dmytro Kazankov


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc13-gnat/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 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/buildlink3.mk
diff -u pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.2 pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.3
--- pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.2    Sat Feb  8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/buildlink3.mk        Sun Feb 16 10:10:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2025/02/08 14:05:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/02/16 10:10:22 wiz Exp $
 
 BUILDLINK_TREE+=       gcc13-gnat
 
@@ -10,14 +10,27 @@ BUILDLINK_ABI_DEPENDS.gcc13-gnat+=  gcc13
 BUILDLINK_PKGSRCDIR.gcc13-gnat=                ../../lang/gcc13-gnat
 BUILDLINK_DEPMETHOD.gcc13-gnat?=       build
 
+PREPEND_PATH+= ${BUILDLINK_DIR}/gcc13-gnat/bin
+
 GNU_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 
-ADALIB_PREFIX= gcc13-gnat/lib/gcc/${GNU_TARGET_MACHINE}/13.3.0
+ADALIB_PREFIX=         gcc13-gnat/lib/gcc/${GNU_TARGET_MACHINE}/13.3.0
+
+BUILDLINK_FILES.gcc13-gnat+=   gcc13-gnat/${GNU_TARGET_MACHINE}/lib/*
 
-BUILDLINK_FILES.gcc13-gnat+=   ${ADALIB_PREFIX}/adalib/*.ali
+BUILDLINK_INCDIRS.gcc13-gnat+= gcc13-gnat/include
+BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/include
+BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/include-fixed
+BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/plugin/include
+BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/adainclude
+
+BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/lib
+BUILDLINK_LIBDIRS.gcc13-gnat+= ${ADALIB_PREFIX}
+BUILDLINK_LIBDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/adalib
+BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/${GNU_TARGET_MACHINE}/lib
 
-BUILDLINK_INCDIRS.gcc13-gnat+= gcc13-gnat/include ${ADALIB_PREFIX}/adainclude
-BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/lib ${ADALIB_PREFIX}/adalib
+BUILDLINK_CONTENTS_FILTER.gcc13-gnat=  ${EGREP} \
+                                       '(bin/.*|include/.*|lib/.*|libexec/.*|${GNU_TARGET_MACHINE}/lib/.*)'
 
 pkgbase := gcc13-gnat
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk
diff -u pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk:1.1 pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk:1.2
--- pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk:1.1       Sat Feb  8 14:05:50 2025
+++ pkgsrc/lang/gcc13-gnat-libs/buildlink3.mk   Sun Feb 16 10:10:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2025/02/08 14:05:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2025/02/16 10:10:22 wiz Exp $
 
 BUILDLINK_TREE+=       gcc13-gnat-libs
 
@@ -21,13 +21,7 @@ BUILDLINK_PASSTHRU_DIRS+=    ${TARGET_LIBDI
 
 BUILDLINK_FILES.gcc13-gnat-libs=       #empty
 BUILDLINK_AUTO_VARS.gcc13-gnat-libs=   no
-BUILDLINK_RPATHDIRS.gcc13-gnat-libs=   ${TARGET_LIBDIR.gcc13-gnat-libs}
-
-.if defined(LD_RUN_PATH)
-LD_RUN_PATH:=  ${TARGET_LIBDIR.gcc13-gnat-libs}:${LD_RUN_PATH}
-.else
-LD_RUN_PATH:=  ${TARGET_LIBDIR.gcc13-gnat-libs}
-.endif
+BUILDLINK_AUTO_DIRS.gcc13-gnat-libs=   no
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"