CVS commit: pkgsrc/devel/ada-libgpr-25

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

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Thu Sep  4 08:15:53 UTC 2025

Modified Files:
        pkgsrc/devel/ada-libgpr-25: Makefile distinfo
Added Files:
        pkgsrc/devel/ada-libgpr-25: inplace.mk
Removed Files:
        pkgsrc/devel/ada-libgpr-25/patches:
            patch-gpr_src_gpr-util-put__resource__usage____unix.adb

Log Message:
add inplace build support

* add inplace.mk
* move substitutions from pre-configure stage to post-extract stage
* convert patch to substitution


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ada-libgpr-25/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ada-libgpr-25/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ada-libgpr-25/inplace.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/ada-libgpr-25/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb

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

Modified files:

Index: pkgsrc/devel/ada-libgpr-25/Makefile
diff -u pkgsrc/devel/ada-libgpr-25/Makefile:1.2 pkgsrc/devel/ada-libgpr-25/Makefile:1.3
--- pkgsrc/devel/ada-libgpr-25/Makefile:1.2     Mon Jul 14 13:48:28 2025
+++ pkgsrc/devel/ada-libgpr-25/Makefile Thu Sep  4 08:15:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2025/07/14 13:48:28 dkazankov Exp $
+# $NetBSD: Makefile,v 1.3 2025/09/04 08:15:53 dkazankov Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       libgpr-${GNAT_NAME}-25.0.0
@@ -25,7 +25,7 @@ GCC_REQD+=    14
 
 SUBST_CLASSES+=                version
 SUBST_MESSAGE.version= Replace version,date and type in ${SUBST_FILES.version}
-SUBST_STAGE.version=   pre-configure
+SUBST_STAGE.version=   post-extract
 SUBST_FILES.version=   gpr/src/gpr-version.ads
 SUBST_SED.version=     -e "s,18.0w,25.0w,"
 SUBST_SED.version+=    -e "s,19940713,20241126,"
@@ -36,9 +36,9 @@ SUBST_SED.version+=   -e "s,= Gnatpro;,= F
 .if ${OPSYS} == "NetBSD"
 SUBST_CLASSES+=                        getrusage
 SUBST_MESSAGE.getrusage=       Replace getrusage with __netbsd_getrusage in ${SUBST_FILES.getrusage}
-SUBST_STAGE.getrusage=         pre-configure
+SUBST_STAGE.getrusage=         post-extract
 SUBST_FILES.getrusage=         gpr/src/gpr-util-put_resource_usage__unix.adb
-SUBST_SED.getrusage=           -e "s,\"getrusage\",\"__netbsd_getrusage\","
+SUBST_SED.getrusage=           -e "s,with Import\, Convention => C;,with Import\, Convention => C\, External_Name => \"__netbsd_getrusage\";,"
 .endif
 
 CONFIG_SHELL=          ${MAKE_PROGRAM} -f

Index: pkgsrc/devel/ada-libgpr-25/distinfo
diff -u pkgsrc/devel/ada-libgpr-25/distinfo:1.1 pkgsrc/devel/ada-libgpr-25/distinfo:1.2
--- pkgsrc/devel/ada-libgpr-25/distinfo:1.1     Thu Jul 10 17:43:35 2025
+++ pkgsrc/devel/ada-libgpr-25/distinfo Thu Sep  4 08:15:53 2025
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1 2025/07/10 17:43:35 dkazankov Exp $
+$NetBSD: distinfo,v 1.2 2025/09/04 08:15:53 dkazankov Exp $
 
 BLAKE2s (gprbuild-25.0.0.tar.gz) = e9462a136fe46fd9e62e7ba602f746275a41347098f273e90b41cd89c46ce386
 SHA512 (gprbuild-25.0.0.tar.gz) = eb2d7072194323cae90acd0c8683eeb6a806ef6ff2ed4d3496e8b94c5b63dae8a428ec428a3610b380df7e122d7a00d9e9634ef06b5369b165536c99209602ce
 Size (gprbuild-25.0.0.tar.gz) = 940774 bytes
 SHA1 (patch-Makefile) = 56c90f388d955d0a6cb46e8b4f4eb23b73557b0e
 SHA1 (patch-gpr_gpr.gpr) = b18713da0795ebefd241414e5e9171ecfa9b79db
-SHA1 (patch-gpr_src_gpr-util-put__resource__usage____unix.adb) = 73cf60af1123151a4177250ac496384cb55e72ec
 SHA1 (patch-gpr_src_gpr_imports.c) = 1b72dd42355c7f7189d4a4a8a7bcf7153f206731

Added files:

Index: pkgsrc/devel/ada-libgpr-25/inplace.mk
diff -u /dev/null pkgsrc/devel/ada-libgpr-25/inplace.mk:1.1
--- /dev/null   Thu Sep  4 08:15:53 2025
+++ pkgsrc/devel/ada-libgpr-25/inplace.mk       Thu Sep  4 08:15:53 2025
@@ -0,0 +1,85 @@
+# $NetBSD: inplace.mk,v 1.1 2025/09/04 08:15:53 dkazankov Exp $
+#
+# Include this file to extract library source into the WRKSRC of
+# another package.
+#
+# Package-settable variables:
+#
+# CREATE_INPLACE_BUILD_TARGETS
+#      List of build targets that need to be created
+#      Possible values: static-pic, relocatable.
+#
+# System-defined variables:
+#
+# INPLACE_BUILD_TARGETS
+#      A list of build targets which can be used as dependency to build
+#      inplaced libraries.
+
+post-fetch: fetch-inplace-libgpr
+
+post-extract: extract-inplace-libgpr
+
+.PHONY: fetch-inplace-libgpr
+fetch-inplace-libgpr:
+       @${STEP_MSG} Fetching in-place libgpr
+       ${RUN}cd ../../devel/ada-libgpr-25 && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.libgpr \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       checksum
+
+.PHONY: extract-inplace-libgpr
+extract-inplace-libgpr:
+       @${STEP_MSG} Extracting in-place libgpr
+       ${RUN}cd ../../devel/ada-libgpr-25 && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.libgpr \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       patch
+       ${RUN}${MV} ${WRKSRC}/gprbuild-* ${WRKSRC}/libgpr
+
+.if defined(CREATE_INPLACE_BUILD_TARGETS)
+
+USE_TOOLS+=            gmake
+
+.if !empty(CREATE_INPLACE_BUILD_TARGETS:Mrelocatable)
+
+INPLACE_BUILD_TARGETS+=        build-inplace-relocatable-libgpr
+
+.PHONY: build-inplace-relocatable-libgpr
+build-inplace-relocatable-libgpr:
+       @${STEP_MSG} Building in-place relocatable libgpr
+       ${RUN}cd ${WRKSRC}/libgpr && \
+       ${PKGSRC_SETENV} ${CONFIGURE_ENV} \
+           ${MAKE_PROGRAM} prefix=${BUILDLINK_DIR} ENABLE_SHARED=yes -f Makefile setup && \
+       ${PKGSRC_SETENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
+           -f Makefile libgpr.build.shared && \
+       ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} DESTDIR=${BUILDLINK_DIR} \
+           -f Makefile libgpr.install.shared
+
+.endif
+
+.if !empty(CREATE_INPLACE_BUILD_TARGETS:Mstatic-pic)
+
+INPLACE_BUILD_TARGETS+=        build-inplace-static-pic-libgpr
+
+.PHONY: build-inplace-static-pic-libgpr
+build-inplace-static-pic-libgpr:
+       @${STEP_MSG} Building in-place static-pic libgpr
+       ${RUN}cd ${WRKSRC}/libgpr && \
+       ${PKGSRC_SETENV} ${CONFIGURE_ENV} \
+           ${MAKE_PROGRAM} prefix=${BUILDLINK_DIR} ENABLE_SHARED=yes -f Makefile setup && \
+       ${PKGSRC_SETENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
+           -f Makefile libgpr.build.static-pic && \
+       ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} DESTDIR=${BUILDLINK_DIR} \
+           -f Makefile libgpr.install.static-pic
+
+.endif
+
+.endif