CVS commit: pkgsrc/devel/gprbuild

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb  9 13:33:26 UTC 2025

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

Log Message:
gprbuild: improve build framework for other packages

>From Dmytro Kazankov via wip.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/gprbuild/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gprbuild/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gprbuild/gprbuild.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/Makefile
diff -u pkgsrc/devel/gprbuild/Makefile:1.4 pkgsrc/devel/gprbuild/Makefile:1.5
--- pkgsrc/devel/gprbuild/Makefile:1.4  Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/Makefile      Sun Feb  9 13:33:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/02/08 14:14:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/02/09 13:33:26 wiz Exp $
 
 DISTNAME=      gprbuild-25.0.0
 CATEGORIES=    devel
@@ -24,7 +24,6 @@ GCC_REQD+=    13
 OBJDIR=                ${WRKDIR}/build
 BOOTSTRAPDIR=  ${WRKDIR}/bootstrap
 
-CONFIG_PROJECT=                ${WRKDIR}/buildlink.cgpr
 GPR_PROJECT_PATH=      ${WRKDIR}/.buildlink/share/gpr
 
 # environment for bootstrap build
@@ -42,14 +41,14 @@ CONFIGURE_ARGS+=    SOURCE_DIR=${WRKSRC}
 
 BUILD_DIRS=            ${OBJDIR}
 MAKE_FILE=             ${WRKSRC}/Makefile
-BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS='--config=${CONFIG_PROJECT} -aP ${GPR_PROJECT_PATH}'
+BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS='-aP ${GPR_PROJECT_PATH}'
 
 INSTALL_DIRS=          ${OBJDIR}
-INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS='--config=${CONFIG_PROJECT} -aP ${GPR_PROJECT_PATH}'
+INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS='-aP ${GPR_PROJECT_PATH}'
 
 SUBST_CLASSES+=                        buildlink
-SUBST_STAGE.buildlink=         post-configure
-SUBST_FILES.buildlink=         ${CONFIG_PROJECT}
+SUBST_STAGE.buildlink=         pre-configure
+SUBST_FILES.buildlink=         ../build/default.cgpr deps/xmlada/default.cgpr
 SUBST_MESSAGE.buildlink=       Set work directory path in config project
 SUBST_VARS.buildlink=          WRKDIR
 
@@ -65,9 +64,10 @@ GENERATE_PLIST+= \
 
 .include "../../mk/bsd.prefs.mk"
 
-pre-configure:
-       ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${WRKDIR}/
+post-extract:
        ${RUN} ${MKDIR} ${OBJDIR}
+       ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${OBJDIR}/default.cgpr
+       ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${WRKSRC}/deps/xmlada/default.cgpr
 
 post-configure:
        ${RUN} cd ${WRKSRC}/deps/xmlada \
@@ -88,6 +88,6 @@ pre-build:
 # Build xmlada with bootstrapped gprbuild. It then will be used in normal build.
        ${RUN} cd ${WRKSRC}/deps/xmlada \
        && set -x ; env ${MAKE_ENV} \
-       ${MAKE_PROGRAM} all install GPROPTS='--config=${CONFIG_PROJECT}'
+       ${MAKE_PROGRAM} all install
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gprbuild/buildlink3.mk
diff -u pkgsrc/devel/gprbuild/buildlink3.mk:1.3 pkgsrc/devel/gprbuild/buildlink3.mk:1.4
--- pkgsrc/devel/gprbuild/buildlink3.mk:1.3     Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/buildlink3.mk Sun Feb  9 13:33:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2025/02/08 14:14:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/02/09 13:33:26 wiz Exp $
 
 BUILDLINK_TREE+=       gprbuild
 
@@ -30,8 +30,22 @@ INSTALL_ENV+=                GPR_PROJECT_PATH=${GPR_PR
 
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}'$$$$ORIGIN'
 
-GPRBUILD_OPTIONS+=     -eL -R -largs $${LDFLAGS} -gargs
+GPRBUILD_OPTIONS?=     -eL -R -largs $${LDFLAGS} -gargs
+GPRINSTALL_OPTIONS?=   #empty
 BUILD_MAKE_FLAGS+=     GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
+INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}
+
+SUBST_CLASSES+=                        gprbuildlink
+SUBST_STAGE.gprbuildlink=      pre-configure
+SUBST_FILES.gprbuildlink=      default.cgpr
+SUBST_MESSAGE.gprbuildlink=    Set directory path in config file
+SUBST_VARS.gprbuildlink=       WRKDIR
+
+BUILDLINK_TARGETS+=    gprbuild-make-config-project
+
+.PHONY: gprbuild-make-config-project
+gprbuild-make-config-project:
+       ${RUN} ${CP} ${BUILDLINK_PKGSRCDIR.gprbuild}/files/buildlink.cgpr ${WRKSRC}/default.cgpr
 
 .endif
 

Index: pkgsrc/devel/gprbuild/gprbuild.mk
diff -u pkgsrc/devel/gprbuild/gprbuild.mk:1.2 pkgsrc/devel/gprbuild/gprbuild.mk:1.3
--- pkgsrc/devel/gprbuild/gprbuild.mk:1.2       Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/gprbuild.mk   Sun Feb  9 13:33:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gprbuild.mk,v 1.2 2025/02/08 14:14:49 wiz Exp $
+# $NetBSD: gprbuild.mk,v 1.3 2025/02/09 13:33:26 wiz Exp $
 #
 # This Makefile fragment supports building using the GPRbuild tool.
 #
@@ -40,7 +40,7 @@ GPRINSTALL_ENV?=      ${INSTALL_ENV}
 GPRINSTALL_ENV+=       ${GPRBUILD_ENV}
 
 GPRBUILD_ARGS?=                -j0 -p ${GPRBUILD_OPTIONS}
-GPRINSTALL_ARGS?=      --mode=usage -p --prefix=${DESTDIR}${PREFIX}
+GPRINSTALL_ARGS?=      --mode=usage -p --prefix=${DESTDIR}${PREFIX} ${GPRINSTALL_OPTIONS}
 
 GPRBUILD_TOOL=         gprbuild
 GPRINSTALL_TOOL=       gprinstall
@@ -66,6 +66,6 @@ gprbuild-install:
            set -e; \
            cd $$dir && \
                ${PKGSRC_SETENV} ${GPRINSTALL_ENV} \
-               ${GPRINSTALL_TOOL} ${GPRINSTALL_ARGS} ${GPRBUILD_PROJECT_FILE}; \
+               ${GPRINSTALL_TOOL} ${GPRINSTALL_ARGS} -P ${GPRBUILD_PROJECT_FILE}; \
        done
 .endif