CVS commit: pkgsrc/devel/gprbuild

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

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Wed Nov 26 10:21:35 UTC 2025

Modified Files:
        pkgsrc/devel/gprbuild: buildlink3.mk

Log Message:
gprbuild: improve buildlink3.mk

* Move GPR_PROJECT_PATH var definition to ALL_ENV from each separate
  *_ENV
* Move the addition of the library search path from LDFLAGS to the
  gprbuild parameters


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/gprbuild/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/devel/gprbuild/buildlink3.mk
diff -u pkgsrc/devel/gprbuild/buildlink3.mk:1.9 pkgsrc/devel/gprbuild/buildlink3.mk:1.10
--- pkgsrc/devel/gprbuild/buildlink3.mk:1.9     Thu Oct  9 21:12:16 2025
+++ pkgsrc/devel/gprbuild/buildlink3.mk Wed Nov 26 10:21:35 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2025/10/09 21:12:16 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2025/11/26 10:21:35 dkazankov Exp $
 
 BUILDLINK_TREE+=       gprbuild
 
@@ -16,16 +16,12 @@ BUILDLINK_FNAME_TRANSFORM.gprbuild+=        -e 
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-# Buildlinked libraries search path
+# Buildlinked packages search path
 GPR_PROJECT_PATH?=     ${BUILDLINK_DIR}/share/gpr
-CONFIGURE_ENV+=                GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
-MAKE_ENV+=             GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
-INSTALL_ENV+=          GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
-
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}'$$$$ORIGIN'
-
-GPRBUILD_OPTIONS?=     -eL -R -cargs $${CFLAGS} -largs $${LDFLAGS} -gargs
+GPRBUILD_OPTIONS?=     -eL -R -cargs $${CFLAGS} -largs -L ${BUILDLINK_DIR}/lib $${LDFLAGS} ${COMPILER_RPATH_FLAG}'$$$$ORIGIN' -gargs
 GPRINSTALL_OPTIONS?=   #empty
+
+ALL_ENV+=              GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
 BUILD_MAKE_FLAGS+=     GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
 INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}