gcc14-gnat,gcc14-gnat-libs: update buildlink3.mk

[Dmytro Kazankov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Wed Feb 12 19:47:53 2025 +0200
Changeset:	bf2a9da4c82153aa71886cff35691d9e8cdeb1b1

Modified Files:
	gcc14-gnat-libs/buildlink3.mk
	gcc14-gnat/buildlink3.mk

Log Message:
gcc14-gnat,gcc14-gnat-libs: update buildlink3.mk

* Improve buildlink3.mk files to support gprbuild

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf2a9da4c82153aa71886cff35691d9e8cdeb1b1

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

diffstat:
 gcc14-gnat-libs/buildlink3.mk | 11 +----------
 gcc14-gnat/buildlink3.mk      | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diffs:
diff --git a/gcc14-gnat-libs/buildlink3.mk b/gcc14-gnat-libs/buildlink3.mk
index 32c7a94fd7..3692469613 100644
--- a/gcc14-gnat-libs/buildlink3.mk
+++ b/gcc14-gnat-libs/buildlink3.mk
@@ -21,16 +21,7 @@ BUILDLINK_PASSTHRU_DIRS+=	${TARGET_LIBDIR.gcc14-gnat-libs}
 
 BUILDLINK_FILES.gcc14-gnat-libs=	#empty
 BUILDLINK_AUTO_VARS.gcc14-gnat-libs=	no
-BUILDLINK_RPATHDIRS.gcc14-gnat-libs=	${TARGET_LIBDIR.gcc14-gnat-libs}
-
-.if defined(LD_RUN_PATH)
-LD_RUN_PATH:=	${TARGET_LIBDIR.gcc14-gnat-libs}:${LD_RUN_PATH}
-.else
-LD_RUN_PATH:=	${TARGET_LIBDIR.gcc14-gnat-libs}
-.endif
-
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${TARGET_LIBDIR.gcc14-gnat-libs}
-LDFLAGS+=	-Wl,-z,relro,-z,now
+BUILDLINK_AUTO_DIRS.gcc14-gnat-libs=	no
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/gcc14-gnat/buildlink3.mk b/gcc14-gnat/buildlink3.mk
index 9f623d3cc6..c2ca47d8af 100644
--- a/gcc14-gnat/buildlink3.mk
+++ b/gcc14-gnat/buildlink3.mk
@@ -10,14 +10,27 @@ BUILDLINK_ABI_DEPENDS.gcc14-gnat+=	gcc14-gnat>=14.1
 BUILDLINK_PKGSRCDIR.gcc14-gnat=		../../wip/gcc14-gnat
 BUILDLINK_DEPMETHOD.gcc14-gnat?=	build
 
+PREPEND_PATH+=	${BUILDLINK_DIR}/gcc14-gnat/bin
+
 GNU_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 
 ADALIB_PREFIX=	gcc14-gnat/lib/gcc/${GNU_TARGET_MACHINE}/14.2.0
 
-BUILDLINK_FILES.gcc14-gnat+=	${ADALIB_PREFIX}/adalib/*.ali
+BUILDLINK_FILES.gcc14-gnat+=	gcc14-gnat/${GNU_TARGET_MACHINE}/lib/*
+
+BUILDLINK_INCDIRS.gcc14-gnat+=	gcc14-gnat/include
+BUILDLINK_INCDIRS.gcc14-gnat+=	${ADALIB_PREFIX}/include
+BUILDLINK_INCDIRS.gcc14-gnat+=	${ADALIB_PREFIX}/include-fixed
+BUILDLINK_INCDIRS.gcc14-gnat+=	${ADALIB_PREFIX}/plugin/include
+BUILDLINK_INCDIRS.gcc14-gnat+=	${ADALIB_PREFIX}/adainclude
+
+BUILDLINK_LIBDIRS.gcc14-gnat+=	gcc14-gnat/lib
+BUILDLINK_LIBDIRS.gcc14-gnat+=	${ADALIB_PREFIX}
+BUILDLINK_LIBDIRS.gcc14-gnat+=	${ADALIB_PREFIX}/adalib
+BUILDLINK_LIBDIRS.gcc14-gnat+=	gcc14-gnat/${GNU_TARGET_MACHINE}/lib
 
-BUILDLINK_INCDIRS.gcc14-gnat+=	gcc14-gnat/include ${ADALIB_PREFIX}/adainclude
-BUILDLINK_LIBDIRS.gcc14-gnat+=	gcc14-gnat/lib ${ADALIB_PREFIX}/adalib
+BUILDLINK_CONTENTS_FILTER.gcc14-gnat = ${EGREP} \
+    '(bin/.*|include/.*|lib/.*|libexec/.*|${GNU_TARGET_MACHINE}/lib/.*)'
 
 pkgbase := gcc14-gnat
 .include "../../mk/pkg-build-options.mk"