CVS commit: pkgsrc/devel/gprbuild

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb 16 10:11:49 UTC 2025

Modified Files:
        pkgsrc/devel/gprbuild: Makefile buildlink3.mk distinfo
        pkgsrc/devel/gprbuild/patches: patch-Makefile
Added Files:
        pkgsrc/devel/gprbuild/patches: patch-deps_gprconfig__kb_db_linker.xml
Removed Files:
        pkgsrc/devel/gprbuild/files: buildlink.cgpr

Log Message:
gprbuild: update to 25.0.0nb1

>From Dmytro Kazankov in wip.

* Simplify Makefile and buildlink3.mk
* Patch knowledge database to fix child package link time warning


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gprbuild/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/gprbuild/buildlink3.mk \
    pkgsrc/devel/gprbuild/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/gprbuild/files/buildlink.cgpr
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gprbuild/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml

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.5 pkgsrc/devel/gprbuild/Makefile:1.6
--- pkgsrc/devel/gprbuild/Makefile:1.5  Sun Feb  9 13:33:26 2025
+++ pkgsrc/devel/gprbuild/Makefile      Sun Feb 16 10:11:48 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2025/02/09 13:33:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2025/02/16 10:11:48 wiz Exp $
 
 DISTNAME=      gprbuild-25.0.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -17,6 +18,9 @@ GITHUB_SUBMODULES+=   AdaCore gprconfig_kb
 
 USE_TOOLS+=    gmake
 
+MKPIE_SUPPORTED=       no
+RELRO_SUPPORTED=       no
+
 HAS_CONFIGURE= yes
 
 GCC_REQD+=     13
@@ -36,8 +40,7 @@ CONFIGURE_DIRS=               ${OBJDIR}
 CONFIG_SHELL=          ${MAKE_PROGRAM} -f
 CONFIGURE_SCRIPT=      ${WRKSRC}/Makefile
 CONFIGURE_ARGS=                setup
-CONFIGURE_ARGS+=       prefix=${DESTDIR}${PREFIX}
-CONFIGURE_ARGS+=       SOURCE_DIR=${WRKSRC}
+CONFIGURE_ARGS+=       prefix=${DESTDIR}${PREFIX} SOURCE_DIR=${WRKSRC} ENABLE_SHARED=yes
 
 BUILD_DIRS=            ${OBJDIR}
 MAKE_FILE=             ${WRKSRC}/Makefile
@@ -46,12 +49,6 @@ BUILD_MAKE_FLAGS=    GPRBUILD_OPTIONS='-aP 
 INSTALL_DIRS=          ${OBJDIR}
 INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS='-aP ${GPR_PROJECT_PATH}'
 
-SUBST_CLASSES+=                        buildlink
-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
-
 SUBST_CLASSES+=                        fixver
 SUBST_STAGE.fixver=            pre-configure
 SUBST_FILES.fixver=            deps/xmlada/configure
@@ -66,17 +63,9 @@ GENERATE_PLIST+= \
 
 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 \
-       && set -x ; env ${CONFIGURE_ENV} \
-       ./configure \
-           --prefix=${WRKDIR}/.buildlink
 
-pre-build:
-# Bootstrap build
+pre-configure:
+# Bootstrap build. Moved here because configure script of gprbuild uses gprbuild itself.
        ${RUN} ${MKDIR} ${BOOTSTRAPDIR}
        ${RUN} cd ${BOOTSTRAPDIR} \
        && set -x ; env ${PREBUILD_ENV} \
@@ -85,9 +74,16 @@ pre-build:
            --srcdir=${WRKSRC} \
            --with-xmlada=${WRKSRC}/deps/xmlada \
            --with-kb=${WRKSRC}/deps/gprconfig_kb
+
+pre-build:
+# Xmlada's configure uses gprbuild. So we configure it here.
+       ${RUN} cd ${WRKSRC}/deps/xmlada \
+       && set -x ; env ${CONFIGURE_ENV} \
+       ./configure \
+           --prefix=${WRKDIR}/.buildlink
 # 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
+       ${MAKE_PROGRAM} static-pic install-static-pic
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gprbuild/buildlink3.mk
diff -u pkgsrc/devel/gprbuild/buildlink3.mk:1.4 pkgsrc/devel/gprbuild/buildlink3.mk:1.5
--- pkgsrc/devel/gprbuild/buildlink3.mk:1.4     Sun Feb  9 13:33:26 2025
+++ pkgsrc/devel/gprbuild/buildlink3.mk Sun Feb 16 10:11:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2025/02/09 13:33:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2025/02/16 10:11:48 wiz Exp $
 
 BUILDLINK_TREE+=       gprbuild
 
@@ -35,18 +35,6 @@ 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
 
 BUILDLINK_TREE+=       -gprbuild
Index: pkgsrc/devel/gprbuild/distinfo
diff -u pkgsrc/devel/gprbuild/distinfo:1.4 pkgsrc/devel/gprbuild/distinfo:1.5
--- pkgsrc/devel/gprbuild/distinfo:1.4  Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/distinfo      Sun Feb 16 10:11:48 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2025/02/08 14:14:49 wiz Exp $
+$NetBSD: distinfo,v 1.5 2025/02/16 10:11:48 wiz Exp $
 
 BLAKE2s (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = eb32df0aa23a0ba4c8bcc88a580a06887ff7b12efc87bb0eac9b4d292ec548a6
 SHA512 (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
@@ -9,8 +9,9 @@ Size (AdaCore-xmlada-v25.0.0.tar.gz) = 1
 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) = a6fad4177b6537675ca5775c317ad05dbae63c95
+SHA1 (patch-Makefile) = 62aaca338e57df5c6ae5f008df078b991e9ebfdd
 SHA1 (patch-bootstrap.sh) = 0f8fa38605225385975291a4d62d22a77762813f
+SHA1 (patch-deps_gprconfig__kb_db_linker.xml) = 6fdc8e78ba3651eae37a132fff8e53ad988b2a71
 SHA1 (patch-deps_xmlada_Makefile.in) = 98632303e6829b0540abeca6a5a7cd427b455adf
 SHA1 (patch-gpr_gpr.gpr) = 321bce32cb8af1821e2e6b6b8d6ca75194410a0b
 SHA1 (patch-gpr_src_gpr-util-put__resource__usage____unix.adb) = c134d5aad0b90da41eef03cd2e5d98e2f14611fb

Index: pkgsrc/devel/gprbuild/patches/patch-Makefile
diff -u pkgsrc/devel/gprbuild/patches/patch-Makefile:1.3 pkgsrc/devel/gprbuild/patches/patch-Makefile:1.4
--- pkgsrc/devel/gprbuild/patches/patch-Makefile:1.3    Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-Makefile        Sun Feb 16 10:11:49 2025
@@ -1,28 +1,36 @@
-$NetBSD: patch-Makefile,v 1.3 2025/02/08 14:14:49 wiz Exp $
+$NetBSD: patch-Makefile,v 1.4 2025/02/16 10:11:49 wiz Exp $
 
-Make it possible to set install parameters, fix install parameters, ENABLE_SHARED
+Make it possible to set install parameters
+Fix install parameters
+Fix ENABLE_SHARED position
 
---- Makefile.orig      2023-10-09 21:31:11.000000000 +0300
-+++ Makefile   2024-05-08 22:24:58.865354615 +0300
-@@ -34,6 +34,9 @@
+--- Makefile.orig      2024-10-07 15:45:16.000000000 +0300
++++ Makefile
+@@ -34,9 +34,6 @@
  SOURCE_DIR    := $(shell dirname "$(MAKEFILE_LIST)")
  LIB_DIR       = lib/
  
-+ENABLE_SHARED := $(shell gprbuild $(GTARGET) -c -q -p \
-+      -P$(MAKEPREFIX)config/test_shared 2>/dev/null && echo "yes")
-+
- # Load current setup if any
- -include makefile.setup
- 
-@@ -45,6 +48,7 @@
+-# Load current setup if any
+--include makefile.setup
+-
+ # target options for cross-build
+ ifeq ($(HOST),$(TARGET))
+ GTARGET=
+@@ -45,6 +42,13 @@
  GTARGET=--target=$(TARGET)
  endif
  
++ENABLE_SHARED := $(shell gprbuild $(GTARGET) -c -q -p \
++      -P$(MAKEPREFIX)config/test_shared 2>/dev/null && echo "yes")
++
++# Load current setup if any
++-include makefile.setup
++
 +GPRINSTALL_OPTIONS=
  INSTALLER=$(LIB_INSTALLER)
  EXEC_INSTALLER=$(INSTALLER) -XBUILD=${BUILD}
  
-@@ -61,24 +65,21 @@
+@@ -61,32 +65,29 @@
  MAKEPREFIX=$(SOURCE_DIR)/
  endif
  
@@ -50,7 +58,8 @@ Make it possible to set install paramete
  CLEANER=gprclean -q $(RBD)
  
  GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
-@@ -86,7 +87,7 @@
+-      -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
++      -XLIBRARY_TYPE=static-pic -XXMLADA_BUILD=static-pic
  LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) $(LIBGPR_OS)
  LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) $(LIBGPR_OS) -XBUILD=${BUILD} \
        --install-name=gpr \

Added files:

Index: pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml
diff -u /dev/null pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml:1.1
--- /dev/null   Sun Feb 16 10:11:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml        Sun Feb 16 10:11:49 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-deps_gprconfig__kb_db_linker.xml,v 1.1 2025/02/16 10:11:49 wiz Exp $
+
+Fix link time lto plugin warning
+
+--- deps/gprconfig_kb/db/linker.xml.orig       2024-09-09 17:54:27.000000000 +0300
++++ deps/gprconfig_kb/db/linker.xml
+@@ -1000,9 +1000,9 @@
+       <target name="^cuda$" />
+     </targets>
+     <config>
+-   for Archive_Builder  use ("ar", "cr");
++   for Archive_Builder  use ("gcc-ar", "cr");
+    for Archive_Builder_Append_Option use ("q");
+-   for Archive_Indexer  use ("ranlib");
++   for Archive_Indexer  use ("gcc-ranlib");
+    for Archive_Suffix   use ".a";
+     </config>
+   </configuration>