CVS commit: pkgsrc/devel/gprbuild

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

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Sun Jun  7 03:54:41 UTC 2026

Modified Files:
        pkgsrc/devel/gprbuild: Makefile PLIST distinfo
        pkgsrc/devel/gprbuild/patches: patch-Makefile
            patch-deps_gprconfig__kb_db_linker.xml patch-gprbuild.gpr

Log Message:
gprbuild: update to 26.0.0

* Fix corner cases bug of gprbuild implementation of gmake jobserver
* Added warning messages about GNU make minimal version
* Fix documentation about jobservers
* Fix a regression where "-static" switch was not taken into account by the binder
* Remove production of gprslave
* Allow building only gprbuild and associated gprlib and gprbind
* Add delays to avoid polling on tokens preordering to save CPU usage
* Properly handle executable name for gprbuild1


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/gprbuild/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gprbuild/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gprbuild/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gprbuild/patches/patch-Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr

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.7 pkgsrc/devel/gprbuild/Makefile:1.8
--- pkgsrc/devel/gprbuild/Makefile:1.7  Thu Oct  9 15:46:43 2025
+++ pkgsrc/devel/gprbuild/Makefile      Sun Jun  7 03:54:41 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2025/10/09 15:46:43 dkazankov Exp $
+# $NetBSD: Makefile,v 1.8 2026/06/07 03:54:41 dkazankov Exp $
 
-DISTNAME=      gprbuild-${GITHUB_TAG}
-PKGNAME=       ${DISTNAME}.0
+DISTNAME=      ${PKGNAME}
+PKGNAME=       gprbuild-26.0.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
-GITHUB_TAG=    25.2
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/AdaCore/gprbuild
@@ -26,14 +26,14 @@ DEPENDS=    pkg_alternatives-[0-9]*:../../p
 
 .include "../../mk/bsd.prefs.mk"
 
-GCC_REQD+=     14
+GCC_REQD+=     15
 
 SUBST_CLASSES+=                version
 SUBST_MESSAGE.version= Replace version,date and type in ${SUBST_FILES.version}
 SUBST_STAGE.version=   post-extract
 SUBST_FILES.version=   gpr/src/gpr-version.ads
-SUBST_SED.version=     -e "s,18.0w,${GITHUB_TAG}w,"
-SUBST_SED.version+=    -e "s,19940713,20250225,"
+SUBST_SED.version=     -e "s,18.0w,26.0,"
+SUBST_SED.version+=    -e "s,19940713,20251128,"
 SUBST_SED.version+=    -e "s,\"2016\",\"2025\","
 SUBST_SED.version+=    -e "s,= Gnatpro;,= FSF;,"
 
@@ -53,29 +53,6 @@ GPR_PROJECT_PATH=    ${WRKDIR}/.buildlink/s
 GPRBUILD_OPTIONS=      -aP ${GPR_PROJECT_PATH:Q}
 GPRINSTALL_OPTIONS=    -aP ${GPR_PROJECT_PATH:Q}
 
-# environment for bootstrap build
-PREBUILD_ENV=  ${CONFIGURE_ENV}
-PREBUILD_ENV+= CC=${CC:Q}
-PREBUILD_ENV+= CFLAGS=${CFLAGS:M:Q}
-PREBUILD_ENV+= GNATMAKE=${GMKPATH:Q}
-
-CONFIGURE_DIRS=                ${OBJDIR}
-CONFIG_SHELL=          ${MAKE_PROGRAM} -f
-CONFIGURE_SCRIPT=      ${WRKSRC}/Makefile
-CONFIGURE_ARGS=                setup
-CONFIGURE_ARGS+=       prefix=${DESTDIR}${PREFIX} SOURCE_DIR=${WRKSRC} ENABLE_SHARED=yes
-
-BUILD_DIRS=            ${OBJDIR}
-MAKE_FILE=             ${WRKSRC}/Makefile
-BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
-
-INSTALL_DIRS=          ${OBJDIR}
-INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}
-
-GENERATE_PLIST+= \
-       cd ${DESTDIR}${PREFIX} && \
-       ${FIND} bin libexec share \( -type f -or -type l \) -print | ${SORT};
-
 pre-configure:
        ${MV} ${WRKSRC}/xmlada ${WRKSRC}/deps/
 # Bootstrap build. Moved here because configure script of gprbuild uses gprbuild itself.
@@ -89,20 +66,47 @@ pre-configure:
            --with-xmlada=${WRKSRC}/deps/xmlada \
            --with-kb=${WRKSRC}/deps/gprconfig_kb
 
+CONFIGURE_DIRS=                ${OBJDIR}
+CONFIG_SHELL=          ${MAKE_PROGRAM} -f
+CONFIGURE_SCRIPT=      ${WRKSRC}/Makefile
+CONFIGURE_ARGS=                setup
+CONFIGURE_ARGS+=       prefix=${DESTDIR}${PREFIX} SOURCE_DIR=${WRKSRC} ENABLE_SHARED=no
+
+# environment for bootstrap build
+PREBUILD_ENV=  ${CONFIGURE_ENV}
+PREBUILD_ENV+= CC=${CC:Q}
+PREBUILD_ENV+= CFLAGS=${CFLAGS:M:Q}
+PREBUILD_ENV+= GNATMAKE=${GMKPATH:Q}
+
 pre-build:
 # Xmlada's configure uses gprbuild. So we configure it here.
-       ${RUN} cd ${WRKSRC}/deps/xmlada && \
+       ${RUN}cd ${WRKSRC}/deps/xmlada && \
        ${PKGSRC_SETENV} ${CONFIGURE_ENV} \
        ./configure \
-           --prefix=${WRKDIR}/.buildlink
+           --prefix=${WRKDIR}/.buildlink --disable-shared
 # Build xmlada with bootstrapped gprbuild. It then will be used in normal build.
-       ${RUN} cd ${WRKSRC}/deps/xmlada && \
+       ${RUN}cd ${WRKSRC}/deps/xmlada && \
        ${PKGSRC_SETENV} ${MAKE_ENV} \
        ${MAKE_PROGRAM} static install-static
 
+BUILD_DIRS=            ${OBJDIR}
+MAKE_FILE=             ${WRKSRC}/Makefile
+BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
+
+INSTALL_DIRS=          ${OBJDIR}
+INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}
+
+GENERATE_PLIST+= \
+       cd ${DESTDIR}${PREFIX} && \
+       ${FIND} bin libexec share \( -type f -or -type l \) -print | ${SORT};
+
 post-install:
        ${RM} ${DESTDIR}${PREFIX}/share/gprconfig/linker.xml.orig
+       ${RUN}cd ${DESTDIR}${PREFIX}/bin && \
+           ${MV} gprbuild gpr1build && \
+           ${MV} gprconfig gpr1config && \
+           ${MV} gprclean gpr1clean
 
-.include "../../textproc/ada-xmlada-25/inplace.mk"
+.include "../../textproc/ada-xmlada26/inplace.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gprbuild/PLIST
diff -u pkgsrc/devel/gprbuild/PLIST:1.3 pkgsrc/devel/gprbuild/PLIST:1.4
--- pkgsrc/devel/gprbuild/PLIST:1.3     Thu Oct  9 15:46:43 2025
+++ pkgsrc/devel/gprbuild/PLIST Sun Jun  7 03:54:41 2026
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2025/10/09 15:46:43 dkazankov Exp $
+@comment $NetBSD: PLIST,v 1.4 2026/06/07 03:54:41 dkazankov Exp $
 bin/gpr1build
 bin/gpr1clean
 bin/gpr1config
 bin/gprinstall
 bin/gprls
 bin/gprname
-bin/gprslave
 libexec/gprbuild/gprbind
 libexec/gprbuild/gprlib
 share/examples/gprbuild/Makefile

Index: pkgsrc/devel/gprbuild/distinfo
diff -u pkgsrc/devel/gprbuild/distinfo:1.6 pkgsrc/devel/gprbuild/distinfo:1.7
--- pkgsrc/devel/gprbuild/distinfo:1.6  Thu Oct  9 15:46:43 2025
+++ pkgsrc/devel/gprbuild/distinfo      Sun Jun  7 03:54:41 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.6 2025/10/09 15:46:43 dkazankov Exp $
+$NetBSD: distinfo,v 1.7 2026/06/07 03:54:41 dkazankov Exp $
 
-BLAKE2s (AdaCore-gprconfig_kb-25.2.tar.gz) = 549d321895fe6b915492c66e3ad82861bcbfae9de4e395d925b043643b8fb665
-SHA512 (AdaCore-gprconfig_kb-25.2.tar.gz) = be2345270a0cfe6f57d9431174f86d90a50fd6c2989047bdcd6cf20b92690443c0f7cc24f52dff292446ad0e26c23f12c1a19ee525bc03d9f29d31e73ab4554e
-Size (AdaCore-gprconfig_kb-25.2.tar.gz) = 44291 bytes
-BLAKE2s (gprbuild-25.2.tar.gz) = 677bddddb79366bc959bb4cf54eceba646880a7e946bf9b1f23f04d3a9d98379
-SHA512 (gprbuild-25.2.tar.gz) = 0d7d161392d00592b06ab8a2af21b610f60897d90aee2a3c51f001de0f1f9c338ef4059a3c20b99cd29a0587f8ba1a8e652f1b593f1d3033d9b7795a9f4a9aaa
-Size (gprbuild-25.2.tar.gz) = 940851 bytes
-SHA1 (patch-Makefile) = b64390f5a5b9821628223e423d8dcead28a0600a
+BLAKE2s (AdaCore-gprconfig_kb-v26.0.0.tar.gz) = 931a36353310fb1d5feced18cf2bcb3787c80e8b689e7be38bb4a35a7ab91bc6
+SHA512 (AdaCore-gprconfig_kb-v26.0.0.tar.gz) = 8125c05da4374b14aee34d429715dac4a08e21cf9c9a2b06931d619ccbf315e3b2e64f06d1b6f3ef6b7403b8d08c53210bf3dd79f5762fa1b1a62a0ea725c814
+Size (AdaCore-gprconfig_kb-v26.0.0.tar.gz) = 49684 bytes
+BLAKE2s (gprbuild-26.0.0.tar.gz) = 8645f2ff70d3d8d491cd5058a23a35b18b2aa1d63c67fd89e95274ca06d69905
+SHA512 (gprbuild-26.0.0.tar.gz) = e5a5dcaf0162154793b23655a9804453498b230a377ae45eabe67f51e15ff69194d98a6b6839fd2ebb0d136e3128e47d296da10ea7be67bec8dbed1d016a1777
+Size (gprbuild-26.0.0.tar.gz) = 922278 bytes
+SHA1 (patch-Makefile) = a55fcb80a8f06ca4c91aacc8d3e3af87642164c6
 SHA1 (patch-bootstrap.sh) = 49a80b50cb32245527e09c6859ad829cd2266445
-SHA1 (patch-deps_gprconfig__kb_db_linker.xml) = 6fdc8e78ba3651eae37a132fff8e53ad988b2a71
+SHA1 (patch-deps_gprconfig__kb_db_linker.xml) = 6e61f3ea5e704ee91ae4355af94906264b39bc64
 SHA1 (patch-gpr_gpr.gpr) = b18713da0795ebefd241414e5e9171ecfa9b79db
 SHA1 (patch-gpr_src_gpr_imports.c) = 1b72dd42355c7f7189d4a4a8a7bcf7153f206731
-SHA1 (patch-gprbuild.gpr) = 2940dc5235ddebdf8e2a486ef81cb38af7d001c9
+SHA1 (patch-gprbuild.gpr) = 91d5e19973e7a423c0482bd86ebf24cdf12e8c18

Index: pkgsrc/devel/gprbuild/patches/patch-Makefile
diff -u pkgsrc/devel/gprbuild/patches/patch-Makefile:1.5 pkgsrc/devel/gprbuild/patches/patch-Makefile:1.6
--- pkgsrc/devel/gprbuild/patches/patch-Makefile:1.5    Thu Oct  9 15:46:43 2025
+++ pkgsrc/devel/gprbuild/patches/patch-Makefile        Sun Jun  7 03:54:41 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.5 2025/10/09 15:46:43 dkazankov Exp $
+$NetBSD: patch-Makefile,v 1.6 2026/06/07 03:54:41 dkazankov Exp $
 
 Make it possible to set install parameters
 Fix install parameters
 Fix ENABLE_SHARED position
 
---- Makefile.orig      2025-02-25 14:35:21.000000000 +0200
+--- Makefile.orig      2025-09-15 16:19:27.000000000 +0300
 +++ Makefile
 @@ -34,9 +34,6 @@
  SOURCE_DIR    := $(shell dirname "$(MAKEFILE_LIST)")
@@ -65,12 +65,3 @@ Fix ENABLE_SHARED position
  LIBGPR_UNINSTALLER=$(LIB_INSTALLER) $(GPR_GPR) $(LIBGPR_OS) --install-name=gpr --uninstall
  
  #########
-@@ -127,7 +128,7 @@
- install:
-       $(EXEC_INSTALLER) --mode=usage --install-name=gprbuild \
-               -XINSTALL_MODE=nointernal $(GPRBUILD_GPR)
--      $(EXEC_INSTALLER) --target=$(TARGET) --mode=usage  --install-name=gprbuild \
-+      $(EXEC_INSTALLER) --mode=usage  --install-name=gprbuild \
-               -XINSTALL_MODE=internal $(GPRBUILD_GPR)
- 
- complete: all install libgpr.install.static

Index: pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml
diff -u pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml:1.1 pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml:1.2
--- pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml:1.1    Sun Feb 16 10:11:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-deps_gprconfig__kb_db_linker.xml        Sun Jun  7 03:54:41 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-deps_gprconfig__kb_db_linker.xml,v 1.1 2025/02/16 10:11:49 wiz Exp $
+$NetBSD: patch-deps_gprconfig__kb_db_linker.xml,v 1.2 2026/06/07 03:54:41 dkazankov 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.orig       2025-09-19 00:21:22.000000000 +0300
 +++ deps/gprconfig_kb/db/linker.xml
-@@ -1000,9 +1000,9 @@
+@@ -1020,9 +1020,9 @@
        <target name="^cuda$" />
      </targets>
      <config>

Index: pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.4 pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.5
--- pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.4        Thu Oct  9 15:46:43 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr    Sun Jun  7 03:54:41 2026
@@ -1,29 +1,15 @@
-$NetBSD: patch-gprbuild.gpr,v 1.4 2025/10/09 15:46:43 dkazankov Exp $
+$NetBSD: patch-gprbuild.gpr,v 1.5 2026/06/07 03:54:41 dkazankov Exp $
 
-Rename executables to prevent conflict with gpr2-tools
 Remove redundant file from install list
 
---- gprbuild.gpr.orig  2025-02-25 14:35:21.000000000 +0200
+--- gprbuild.gpr.orig  2025-09-15 16:19:27.000000000 +0300
 +++ gprbuild.gpr
-@@ -66,9 +66,9 @@
-    -------------
+@@ -176,7 +176,7 @@
  
-    package Builder is
--      for Executable ("gprconfig-main.adb")  use "gprconfig";
--      for Executable ("gprbuild-main.adb")   use "gprbuild";
--      for Executable ("gprclean-main.adb")   use "gprclean";
-+      for Executable ("gprconfig-main.adb")  use "gpr1config";
-+      for Executable ("gprbuild-main.adb")   use "gpr1build";
-+      for Executable ("gprclean-main.adb")   use "gpr1clean";
-       for Executable ("gprinstall-main.adb") use "gprinstall";
-       for Executable ("gprls-main.adb")      use "gprls";
-       for Executable ("gprname-main.adb")    use "gprname";
-@@ -165,7 +165,7 @@
-                when "Windows_NT" =>
-                   for Artifacts ("bin") use ("src/gprinstall.exe.manifest");
+             case Target is
                 when "UNIX" =>
 -                  for Artifacts (".") use ("doinstall");
 +                  null;
+                when others =>
              end case;
- 
-          when "internal" =>
+          when others =>