CVS commit: pkgsrc/devel/ada-gnatcoll-core-25

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

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

Modified Files:
        pkgsrc/devel/ada-gnatcoll-core-25: Makefile
Added Files:
        pkgsrc/devel/ada-gnatcoll-core-25: inplace.mk

Log Message:
add inplace build support

* add inplace.mk
* move substitutions from pre-configure stage to post-extract stage
* transfer python binary path to make process


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ada-gnatcoll-core-25/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ada-gnatcoll-core-25/inplace.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/ada-gnatcoll-core-25/Makefile
diff -u pkgsrc/devel/ada-gnatcoll-core-25/Makefile:1.2 pkgsrc/devel/ada-gnatcoll-core-25/Makefile:1.3
--- pkgsrc/devel/ada-gnatcoll-core-25/Makefile:1.2      Fri Jul 11 14:52:45 2025
+++ pkgsrc/devel/ada-gnatcoll-core-25/Makefile  Thu Sep  4 08:08:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2025/07/11 14:52:45 dkazankov Exp $
+# $NetBSD: Makefile,v 1.3 2025/09/04 08:08:01 dkazankov Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${GITHUB_PROJECT}-${GNAT_NAME}-25.0.0
@@ -26,18 +26,18 @@ GCC_REQD+=  14
 .if ${OPSYS} == "NetBSD"
 SUBST_CLASSES+=                ldl
 SUBST_MESSAGE.ldl=     Fix extra libs on NetBSD in ${SUBST_FILES.ldl}
-SUBST_STAGE.ldl=       pre-configure
+SUBST_STAGE.ldl=       post-extract
 SUBST_FILES.ldl=       core/gnatcoll_core.gpr
 SUBST_SED.ldl=         -e "s,\"-ldl\",\"\","
 
 SUBST_CLASSES+=                opendir
 SUBST_MESSAGE.opendir= Replace opendir with __gnatcoll_opendir in ${SUBST_FILES.opendir}
-SUBST_STAGE.opendir=   pre-configure
+SUBST_STAGE.opendir=   post-extract
 SUBST_FILES.opendir=   core/src/os/unix/gnatcoll-os-libc-dirent.ads
 SUBST_SED.opendir=     -e "s,\"opendir\",\"__gnatcoll_opendir\","
 .endif
 
-MAKE_FLAGS+=   prefix=${DESTDIR}${GNAT_PREFIX} BUILD=PROD
+MAKE_FLAGS+=           PYTHON=${PYTHONBIN:Q} prefix=${DESTDIR}${GNAT_PREFIX} BUILD=PROD
 
 PLIST_VARS+=                   shlibs
 

Added files:

Index: pkgsrc/devel/ada-gnatcoll-core-25/inplace.mk
diff -u /dev/null pkgsrc/devel/ada-gnatcoll-core-25/inplace.mk:1.1
--- /dev/null   Thu Sep  4 08:08:01 2025
+++ pkgsrc/devel/ada-gnatcoll-core-25/inplace.mk        Thu Sep  4 08:08:01 2025
@@ -0,0 +1,106 @@
+# $NetBSD: inplace.mk,v 1.1 2025/09/04 08:08:01 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-gnatcoll-core
+
+post-extract: extract-inplace-gnatcoll-core
+
+.PHONY: fetch-inplace-gnatcoll-core
+fetch-inplace-gnatcoll-core:
+       @${STEP_MSG} Fetching in-place gnatcoll-core
+       ${RUN}cd ../../devel/ada-gnatcoll-core-25 && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.gnatcoll-core \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       checksum
+
+.PHONY: extract-inplace-gnatcoll-core
+extract-inplace-gnatcoll-core:
+       @${STEP_MSG} Extracting in-place gnatcoll-core
+       ${RUN}cd ../../devel/ada-gnatcoll-core-25 && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.gnatcoll-core \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       patch
+       ${RUN}${MV} ${WRKSRC}/gnatcoll-core-* ${WRKSRC}/gnatcoll-core
+
+.if defined(CREATE_INPLACE_BUILD_TARGETS)
+
+USE_TOOLS+=            gmake sed
+.include "../../lang/python/tool.mk"
+
+.if !empty(CREATE_INPLACE_BUILD_TARGETS:Mrelocatable)
+
+INPLACE_BUILD_TARGETS+=        build-inplace-relocatable-gnatcoll-core
+
+.PHONY: build-inplace-relocatable-gnatcoll-core
+build-inplace-relocatable-gnatcoll-core:
+       @${STEP_MSG} Building in-place relocatable gnatcoll-core
+       ${RUN}cd ${WRKSRC}/gnatcoll-core && \
+       ${CP} minimal/gnatcoll_minimal.gpr.py minimal/gnatcoll_minimal.gpr.py.orig && \
+       ${SED} -e "s,\"static\"\, \"relocatable\"\, \"static-pic\",\"relocatable\"," \
+           minimal/gnatcoll_minimal.gpr.py.orig \
+           >minimal/gnatcoll_minimal.gpr.py && \
+       ${CP} core/gnatcoll_core.gpr.py core/gnatcoll_core.gpr.py.orig && \
+       ${SED} -e "s,\"static\"\, \"relocatable\"\, \"static-pic\",\"relocatable\"," \
+           core/gnatcoll_core.gpr.py.orig \
+           >core/gnatcoll_core.gpr.py && \
+       ${CP} projects/gnatcoll_projects.gpr.py projects/gnatcoll_projects.gpr.py.orig && \
+       ${SED} -e "s,\"static\"\, \"relocatable\"\, \"static-pic\",\"relocatable\"," \
+           projects/gnatcoll_projects.gpr.py.orig \
+           >projects/gnatcoll_projects.gpr.py && \
+       ${PKGSRC_SETENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} PYTHON=${PYTHONBIN:Q} prefix=${BUILDLINK_DIR} BUILD=PROD ENABLE_SHARED=yes \
+           -f Makefile all && \
+       ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} PYTHON=${PYTHONBIN:Q} prefix=${BUILDLINK_DIR} BUILD=PROD ENABLE_SHARED=yes \
+           -f Makefile install
+
+.endif
+
+.if !empty(CREATE_INPLACE_BUILD_TARGETS:Mstatic-pic)
+
+INPLACE_BUILD_TARGETS+=        build-inplace-static-pic-gnatcoll-core
+
+.PHONY: build-inplace-static-pic-gnatcoll-core
+build-inplace-static-pic-gnatcoll-core:
+       @${STEP_MSG} Building in-place static-pic gnatcoll-core
+       ${RUN}cd ${WRKSRC}/gnatcoll-core && \
+       ${CP} minimal/gnatcoll_minimal.gpr.py minimal/gnatcoll_minimal.gpr.py.orig && \
+       ${SED} -e "s,\"static\"\, \"relocatable\"\, \"static-pic\",\"static-pic\"," \
+           minimal/gnatcoll_minimal.gpr.py.orig \
+           >minimal/gnatcoll_minimal.gpr.py && \
+       ${CP} core/gnatcoll_core.gpr.py core/gnatcoll_core.gpr.py.orig && \
+       ${SED} -e "s,\"static\"\, \"relocatable\"\, \"static-pic\",\"static-pic\"," \
+           core/gnatcoll_core.gpr.py.orig \
+           >core/gnatcoll_core.gpr.py && \
+       ${CP} projects/gnatcoll_projects.gpr.py projects/gnatcoll_projects.gpr.py.orig && \
+       ${SED} -e "s,\"static\"\, \"relocatable\"\, \"static-pic\",\"static-pic\"," \
+           projects/gnatcoll_projects.gpr.py.orig \
+           >projects/gnatcoll_projects.gpr.py && \
+       ${PKGSRC_SETENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} PYTHON=${PYTHONBIN:Q} prefix=${BUILDLINK_DIR} BUILD=PROD ENABLE_SHARED=yes \
+           -f Makefile all && \
+       ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+           ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} PYTHON=${PYTHONBIN:Q} prefix=${BUILDLINK_DIR} BUILD=PROD ENABLE_SHARED=yes \
+           -f Makefile install
+
+.endif
+
+.endif