CVS commit: pkgsrc/devel/gprbuild

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/gprbuild
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 6 Feb 2025 11:27:50 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  6 11:27:49 UTC 2025

Modified Files:
        pkgsrc/devel/gprbuild: Makefile buildlink3.mk distinfo
        pkgsrc/devel/gprbuild/files: buildlink.cgpr
        pkgsrc/devel/gprbuild/patches: patch-Makefile patch-bootstrap.sh
            patch-gpr_gpr.gpr patch-gpr_src_gpr-version.ads patch-gprbuild.gpr
Added Files:
        pkgsrc/devel/gprbuild: gprbuild.mk
        pkgsrc/devel/gprbuild/patches:
            patch-gpr_src_gpr-util-put__resource__usage____unix.adb
Removed Files:
        pkgsrc/devel/gprbuild/patches:
            patch-gpr_src_gpr-util-put__resource__usage____netbsd.adb

Log Message:
devel/gprbuild: Update to 24.0.0nb3

>From Dmytro Kazankov in wip, version from September:

* Removed unnecessary fixed links to Ada RTS in bootstrap build
  so package can be built with newer GNAT versions
* New gprbuild.mk file for packages that use only gprbuild
  for building
* Runpath handling fixes


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gprbuild/Makefile \
    pkgsrc/devel/gprbuild/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gprbuild/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gprbuild/gprbuild.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gprbuild/files/buildlink.cgpr
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gprbuild/patches/patch-Makefile \
    pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh \
    pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads \
    pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____netbsd.adb
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gprbuild/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/gprbuild/Makefile
diff -u pkgsrc/devel/gprbuild/Makefile:1.2 pkgsrc/devel/gprbuild/Makefile:1.3
--- pkgsrc/devel/gprbuild/Makefile:1.2  Tue Mar 19 13:20:35 2024
+++ pkgsrc/devel/gprbuild/Makefile      Thu Feb  6 11:27:49 2025
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2024/03/19 13:20:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/02/06 11:27:49 wiz Exp $
 
 .include "version.mk"
 
 DISTNAME=      gprbuild-${GPRBUILD_VERSION}
-PKGREVISION=   1
+PKGREVISION=   3
 CATEGORIES=    devel
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/AdaCore/gprbuild
 COMMENT=       GPRbuild build system for Ada
 LICENSE=       gnu-gpl-v3
@@ -26,7 +26,9 @@ GCC_REQD+=    13
 
 OBJDIR=                ${WRKDIR}/build
 BOOTSTRAPDIR=  ${WRKDIR}/bootstrap
-CGPRDIR=       ${WRKDIR}
+
+CONFIG_PROJECT=                ${WRKDIR}/buildlink.cgpr
+GPR_PROJECT_PATH=      ${WRKDIR}/.buildlink/share/gpr
 
 # environment for bootstrap build
 PREBUILD_ENV=  ${CONFIGURE_ENV}
@@ -43,18 +45,23 @@ CONFIGURE_ARGS+=    SOURCE_DIR=${WRKSRC}
 
 BUILD_DIRS=            ${OBJDIR}
 MAKE_FILE=             ${WRKSRC}/Makefile
-BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS='--config=${CGPRDIR}/buildlink.cgpr -aP ${WRKDIR}/.buildlink/share/gpr'
+BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS='--config=${CONFIG_PROJECT} -aP ${GPR_PROJECT_PATH}'
 
 INSTALL_DIRS=          ${OBJDIR}
-INSTALL_MAKE_FLAGS=    GPRBUILD_OPTIONS='--config=${CGPRDIR}/buildlink.cgpr -aP ${WRKDIR}/.buildlink/share/gpr'
-INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS='--config=${CGPRDIR}/buildlink.cgpr -aP ${WRKDIR}/.buildlink/share/gpr'
+INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS='--config=${CONFIG_PROJECT} -aP ${GPR_PROJECT_PATH}'
 
 SUBST_CLASSES+=                        buildlink
 SUBST_STAGE.buildlink=         post-configure
-SUBST_FILES.buildlink=         ../buildlink.cgpr
+SUBST_FILES.buildlink=         ${CONFIG_PROJECT}
 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
+SUBST_MESSAGE.fixver=          Fix version in configure
+SUBST_SED.fixver=              -e 's,18.0w,24.0w,g'
+
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} bin libexec share \( -type f -or -type l \) -print | ${SORT};
@@ -62,7 +69,7 @@ GENERATE_PLIST+= \
 .include "../../mk/bsd.prefs.mk"
 
 pre-configure:
-       ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${CGPRDIR}/
+       ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${WRKDIR}/
        ${RUN} ${MKDIR} ${OBJDIR}
 
 post-configure:
@@ -84,6 +91,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=${CGPRDIR}/buildlink.cgpr'
+       ${MAKE_PROGRAM} all install GPROPTS='--config=${CONFIG_PROJECT}'
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/gprbuild/distinfo
diff -u pkgsrc/devel/gprbuild/distinfo:1.2 pkgsrc/devel/gprbuild/distinfo:1.3
--- pkgsrc/devel/gprbuild/distinfo:1.2  Tue Mar 19 13:20:35 2024
+++ pkgsrc/devel/gprbuild/distinfo      Thu Feb  6 11:27:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2024/03/19 13:20:35 wiz Exp $
+$NetBSD: distinfo,v 1.3 2025/02/06 11:27:49 wiz Exp $
 
 BLAKE2s (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = e39c1e70b80923db53f0e6c4687536fcbfdc951209a34dc039423f9cc31319fa
 SHA512 (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
@@ -9,11 +9,11 @@ Size (AdaCore-xmlada-v24.0.0.tar.gz) = 1
 BLAKE2s (gprbuild-24.0.0.tar.gz) = d8279a6ae9f2df9fa76fa5eccb9d58a39f0a71cf27773ed140f2e20f93778e12
 SHA512 (gprbuild-24.0.0.tar.gz) = 09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03
 Size (gprbuild-24.0.0.tar.gz) = 959615 bytes
-SHA1 (patch-Makefile) = 2feb8ed77093d88d70163366206ab4e4a716614a
-SHA1 (patch-bootstrap.sh) = f314016c046426d3f2a40013a9332cf433a4196a
+SHA1 (patch-Makefile) = a6fad4177b6537675ca5775c317ad05dbae63c95
+SHA1 (patch-bootstrap.sh) = 0f8fa38605225385975291a4d62d22a77762813f
 SHA1 (patch-deps_xmlada_Makefile.in) = 98632303e6829b0540abeca6a5a7cd427b455adf
-SHA1 (patch-gpr_gpr.gpr) = 8304a3a14be07908792a19af65750e3f6a968721
-SHA1 (patch-gpr_src_gpr-util-put__resource__usage____netbsd.adb) = d0acc610cce5a2a24b00efa196a658cbfd0afe77
-SHA1 (patch-gpr_src_gpr-version.ads) = 9321ae482f2f36b9d5a6c96225ae3a7a5e16a7e1
+SHA1 (patch-gpr_gpr.gpr) = 321bce32cb8af1821e2e6b6b8d6ca75194410a0b
+SHA1 (patch-gpr_src_gpr-util-put__resource__usage____unix.adb) = c134d5aad0b90da41eef03cd2e5d98e2f14611fb
+SHA1 (patch-gpr_src_gpr-version.ads) = a55a6ee4d51e3321d9ed6dc6e69f27049f84003c
 SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
-SHA1 (patch-gprbuild.gpr) = 557472a3b1fca73e14434b8ecd614e4fdfa726be
+SHA1 (patch-gprbuild.gpr) = e943f95bd4681e3cfde3e1782e9ec2efd9cdf181

Index: pkgsrc/devel/gprbuild/buildlink3.mk
diff -u pkgsrc/devel/gprbuild/buildlink3.mk:1.1 pkgsrc/devel/gprbuild/buildlink3.mk:1.2
--- pkgsrc/devel/gprbuild/buildlink3.mk:1.1     Tue Mar 12 17:50:12 2024
+++ pkgsrc/devel/gprbuild/buildlink3.mk Thu Feb  6 11:27:49 2025
@@ -1,16 +1,40 @@
-# $NetBSD: buildlink3.mk,v 1.1 2024/03/12 17:50:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2025/02/06 11:27:49 wiz Exp $
 
 BUILDLINK_TREE+=       gprbuild
 
 .if !defined(GPRBUILD_BUILDLINK3_MK)
 GPRBUILD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gprbuild+=       gprbuild>=24
-BUILDLINK_ABI_DEPENDS.gprbuild+=       gprbuild>=24.0.0
+BUILDLINK_API_DEPENDS.gprbuild+=       gprbuild>=24.0.0
 BUILDLINK_PKGSRCDIR.gprbuild=          ../../devel/gprbuild
 BUILDLINK_DEPMETHOD.gprbuild?=         build
 
-BUILDLINK_FILES.gprbuild+=     bin/gpr* libexec/gprbuild/* share/gpr/* share/gprbuild/*
+# GPRbuild does similar things in its own way
+BUILDLINK_AUTO_VARS.gprbuild=  no
+BUILDLINK_AUTO_DIRS.gprbuild=  no
+
+BUILDLINK_FILES.gprbuild=      bin/gpr* libexec/gprbuild/*
+BUILDLINK_FILES.gprbuild+=     share/gpr/_default.gpr share/gpr/manifests/gprbuild
+BUILDLINK_FILES.gprbuild+=     share/gprconfig/*
+
+BUILDLINK_CONTENTS_FILTER.gprbuild=    \
+       ${EGREP} '(bin/gpr.*|libexec/gprbuild/gpr.*|share/gpr/.*\.gpr$$|share/gpr/manifests/.*|share/gprconfig/.*)'
+
+TARGET_LIBDIR.gprbuild=        ${PREFIX}/lib
+
+# Buildlinked libraries search path
+GPR_PROJECT_PATH?=     ${BUILDLINK_DIR}/share/gpr
+MAKE_ENV+=             GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
+INSTALL_ENV+=          GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
+
+.if defined(LD_RUN_PATH)
+LD_RUN_PATH:=  ${TARGET_LIBDIR.gprbuild}:${LD_RUN_PATH}
+.else
+LD_RUN_PATH:=  ${TARGET_LIBDIR.gprbuild}
+.endif
+
+GPRBUILD_OPTIONS+=     -R -largs -Wl,-z,origin,-rpath,'$$$$ORIGIN':${LD_RUN_PATH} -gargs
+BUILD_MAKE_FLAGS+=     GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
 
 .endif
 

Index: pkgsrc/devel/gprbuild/files/buildlink.cgpr
diff -u pkgsrc/devel/gprbuild/files/buildlink.cgpr:1.1 pkgsrc/devel/gprbuild/files/buildlink.cgpr:1.2
--- pkgsrc/devel/gprbuild/files/buildlink.cgpr:1.1      Tue Mar 12 17:50:13 2024
+++ pkgsrc/devel/gprbuild/files/buildlink.cgpr  Thu Feb  6 11:27:49 2025
@@ -21,13 +21,9 @@ configuration project default is
    for Shared_Library_Suffix use ".so";
    for Library_Auto_Init_Supported use "true";
    for Run_Path_Option  use ("-Wl,-z,origin,-rpath,");
-   for Run_Path_Origin use "$ORIGIN";
    for Library_Encapsulated_Supported use "true";
    for Library_Encapsulated_Options use ("-shared", "-static-libgcc");
    
-   for Toolchain_Version ("Ada") use "GNAT 13.2.0";
-   for Runtime_Dir       ("Ada") use "@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0";
-
    package Builder is
       for Executable_Suffix use "";
    end Builder;
@@ -69,8 +65,8 @@ configuration project default is
            "   Casing          => %c," &
            "   Dot_Replacement => ""%d"");";
       for Config_File_Unique    ("Ada") use "False";
-      for Leading_Required_Switches ("Ada") use
-        Compiler'Leading_Required_Switches ("Ada") & ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
+      for Leading_Required_Switches ("Ada") use Compiler'Leading_Required_Switches ("Ada");
+      for PIC_Option ("Ada") use ("-fPIC");
         
       for Leading_Required_Switches   ("C") use
          ("-c", "-x", "c") & Compiler'Leading_Required_Switches ("C");
@@ -114,13 +110,12 @@ configuration project default is
       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
       for Driver         ("Ada") use
           "@WRKDIR@/.buildlink/libexec/gprbuild/gprbind";
-      for Required_Switches ("Ada") use
-        Binder'Required_Switches ("Ada") & ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
+      for Required_Switches ("Ada") use Binder'Required_Switches ("Ada");
    end Binder;
    
    package Linker is
       for Map_File_Option         use "-Wl,-Map,";
-      for Driver use Compiler'Driver ("Ada");
+      --for Driver use Compiler'Driver ("Ada");
       for Driver use Compiler'Driver ("C++");
       for Response_File_Format use "GNU";
       for Max_Command_Line_Length use "8192";

Index: pkgsrc/devel/gprbuild/patches/patch-Makefile
diff -u pkgsrc/devel/gprbuild/patches/patch-Makefile:1.1 pkgsrc/devel/gprbuild/patches/patch-Makefile:1.2
--- pkgsrc/devel/gprbuild/patches/patch-Makefile:1.1    Tue Mar 12 17:50:13 2024
+++ pkgsrc/devel/gprbuild/patches/patch-Makefile        Thu Feb  6 11:27:49 2025
@@ -1,10 +1,20 @@
-$NetBSD: patch-Makefile,v 1.1 2024/03/12 17:50:13 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/02/06 11:27:49 wiz Exp $
 
-Make it possible to set install parameters, fix install parameters
+Make it possible to set install parameters, fix install parameters, ENABLE_SHARED
 
 --- Makefile.orig      2023-10-09 21:31:11.000000000 +0300
-+++ Makefile   2023-12-26 15:07:17.160442141 +0200
-@@ -45,6 +45,7 @@
++++ Makefile   2024-05-08 22:24:58.865354615 +0300
+@@ -34,6 +34,9 @@
+ 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 @@
  GTARGET=--target=$(TARGET)
  endif
  
@@ -12,7 +22,19 @@ Make it possible to set install paramete
  INSTALLER=$(LIB_INSTALLER)
  EXEC_INSTALLER=$(INSTALLER) -XBUILD=${BUILD}
  
-@@ -72,13 +73,13 @@
+@@ -61,24 +65,21 @@
+ MAKEPREFIX=$(SOURCE_DIR)/
+ endif
+ 
+-ENABLE_SHARED := $(shell gprbuild $(GTARGET) -c -q -p \
+-      -P$(MAKEPREFIX)config/test_shared 2>/dev/null && echo "yes")
+-
+ ifeq ($(ENABLE_SHARED), yes)
+    LIBGPR_TYPES=static shared static-pic
+ else
+-   LIBGPR_TYPES=static
++   LIBGPR_TYPES=static static-pic
+ endif
  
  # Make sure Windows's "OS" environment variable does not cause
  # confusion for cross-Linux builds.
Index: pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh
diff -u pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.1 pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.2
--- pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.1        Tue Mar 12 17:50:13 2024
+++ pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh    Thu Feb  6 11:27:49 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-bootstrap.sh,v 1.1 2024/03/12 17:50:13 wiz Exp $
+$NetBSD: patch-bootstrap.sh,v 1.2 2025/02/06 11:27:49 wiz Exp $
 
-Fix out-of-tree bootstrap build and fix link time warning on NetBSD
+Fix out-of-tree bootstrap build
 
 --- bootstrap.sh.orig  2023-10-09 21:31:11.000000000 +0300
-+++ bootstrap.sh       2024-03-12 11:02:08.865606070 +0200
-@@ -90,13 +90,16 @@
++++ bootstrap.sh       2024-08-09 10:47:46.065852328 +0300
+@@ -90,13 +90,13 @@
  UName=`uname | cut -b -5`
  PutUsage=gpr/src/gpr-util-put_resource_usage
  
@@ -15,9 +15,6 @@ Fix out-of-tree bootstrap build and fix 
  then
 -      cp ${PutUsage}__null.adb ${PutUsage}.adb
 +      cp ${srcdir}/${PutUsage}__null.adb ${srcdir}/${PutUsage}.adb
-+elif [ "$UName" = "NetBS" ]
-+then
-+      ln ${srcdir}/${PutUsage}__netbsd.adb ${srcdir}/${PutUsage}.adb
  else
 -      ln -s $PWD/${PutUsage}__unix.adb ${PutUsage}.adb
 +      ln -s ${srcdir}/${PutUsage}__unix.adb ${srcdir}/${PutUsage}.adb
Index: pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.1 pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.2
--- pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.1     Tue Mar 19 13:20:35 2024
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads Thu Feb  6 11:27:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gpr_src_gpr-version.ads,v 1.1 2024/03/19 13:20:35 wiz Exp $
+$NetBSD: patch-gpr_src_gpr-version.ads,v 1.2 2025/02/06 11:27:49 wiz Exp $
 
 Fix incorrect version reporting
 
@@ -9,7 +9,7 @@ Fix incorrect version reporting
  package GPR.Version is
  
 -   Gpr_Version : constant String := "18.0w";
-+   Gpr_Version : constant String := "24.0.0";
++   Gpr_Version : constant String := "24.0w";
     --  Static string identifying this version
  
 -   Date : constant String := "19940713";
Index: pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.1 pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.2
--- pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.1        Tue Mar 12 17:50:13 2024
+++ pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr    Thu Feb  6 11:27:49 2025
@@ -1,15 +1,14 @@
-$NetBSD: patch-gprbuild.gpr,v 1.1 2024/03/12 17:50:13 wiz Exp $
+$NetBSD: patch-gprbuild.gpr,v 1.2 2025/02/06 11:27:49 wiz Exp $
 
 Remove redundant file from install list
 
 --- gprbuild.gpr.orig  2023-10-09 21:31:11.000000000 +0300
-+++ gprbuild.gpr       2023-12-26 17:54:25.847810172 +0200
-@@ -165,7 +165,8 @@
++++ gprbuild.gpr       2024-05-07 15:26:53.971304204 +0300
+@@ -165,7 +165,7 @@
                 when "Windows_NT" =>
                    for Artifacts ("bin") use ("src/gprinstall.exe.manifest");
                 when "UNIX" =>
 -                  for Artifacts (".") use ("doinstall");
-+--                  for Artifacts (".") use ("doinstall");
 +                  null;
              end case;
  

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.2 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.3
--- pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.2 Tue Mar 19 13:20:35 2024
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr     Thu Feb  6 11:27:49 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-gpr_gpr.gpr,v 1.2 2024/03/19 13:20:35 wiz Exp $
+$NetBSD: patch-gpr_gpr.gpr,v 1.3 2025/02/06 11:27:49 wiz Exp $
 
-Fix link time warning on NetBSD
+Fix name conflict with grpc - same as linux distros
 
 --- gpr/gpr.gpr.orig   2023-10-09 21:31:11.000000000 +0300
-+++ gpr/gpr.gpr        2024-03-12 10:52:35.183409588 +0200
-@@ -87,7 +87,8 @@
-              for Body ("GPR.Jobserver") use "gpr-jobserver__win.adb";
-          when "UNIX" =>
-              for Body ("GPR.Util.Put_Resource_Usage")
--               use "gpr-util-put_resource_usage__unix.adb";
-+--               use "gpr-util-put_resource_usage__unix.adb";
-+               use "gpr-util-put_resource_usage__netbsd.adb";
-       end case;
-    end Naming;
++++ gpr/gpr.gpr        2024-05-07 16:34:34.759672549 +0300
+@@ -38,7 +38,7 @@
+ 
+    for Source_Dirs use ("src");
+ 
+-   for Library_Name use "gpr";
++   for Library_Name use "gnatprj";
+    for Object_Dir use "libobj/" & Bld & "/" & Gnat_Lib_Type;
+    for Library_Dir use "lib/" & Bld & "/" & Gnat_Lib_Type;
+ 

Added files:

Index: pkgsrc/devel/gprbuild/gprbuild.mk
diff -u /dev/null pkgsrc/devel/gprbuild/gprbuild.mk:1.1
--- /dev/null   Thu Feb  6 11:27:50 2025
+++ pkgsrc/devel/gprbuild/gprbuild.mk   Thu Feb  6 11:27:49 2025
@@ -0,0 +1,71 @@
+# $NetBSD: gprbuild.mk,v 1.1 2025/02/06 11:27:49 wiz Exp $
+#
+# This Makefile fragment supports building using the GPRbuild tool.
+#
+# Package-settable variables:
+#
+# GPRBUILD_PROJECT_FILE
+#      The path to the project file that is processed by GPRbuild and GPRInstall executables.
+#      Default: MAKE_FILE
+#
+# GPRBUILD_ENV
+#      The shell environment that is exported to the GPRbuild process.
+#      Default: MAKE_ENV
+#
+# GPRBUILD_ARGS
+#      Arguments to pass to GPRbuild during build.
+#      Default: -j0 -p
+#
+# BUILD_DIRS
+#      Directories in which to build.
+#      Default: WRKSRC
+#
+# GPRINSTALL_ENV
+#      The shell environment that is exported to the GPRinstall process.
+#      Default: INSTALL_ENV
+#
+# GPRINSTALL_ARGS
+#      Arguments to pass to GPRinstall during installation:
+#      Default: --mode=usage -p --prefix=${DESTDIR}${PREFIX}
+#
+# INSTALL_DIRS
+#      Directories relative in which to run the 'install' step.
+#      Default: WRKSRC
+
+.include "../../devel/gprbuild/buildlink3.mk"
+
+GPRBUILD_PROJECT_FILE?=        ${MAKE_FILE}
+GPRBUILD_ENV?=         ${MAKE_ENV}
+GPRINSTALL_ENV?=       ${INSTALL_ENV}
+GPRINSTALL_ENV+=       ${GPRBUILD_ENV}
+
+GPRBUILD_ARGS?=                -j0 -p ${GPRBUILD_OPTIONS}
+GPRINSTALL_ARGS?=      --mode=usage -p --prefix=${DESTDIR}${PREFIX}
+
+GPRBUILD_TOOL=         gprbuild
+GPRINSTALL_TOOL=       gprinstall
+
+do-build: gprbuild-build
+do-install: gprbuild-install
+
+.if !target(gprbuild-build)
+.PHONY: gprbuild-build
+gprbuild-build:
+       @for dir in ${BUILD_DIRS}; do \
+           set -e; \
+           cd $$dir && \
+               ${PKGSRC_SETENV} ${GPRBUILD_ENV} \
+               ${GPRBUILD_TOOL} ${GPRBUILD_ARGS} -P ${GPRBUILD_PROJECT_FILE}; \
+       done
+.endif
+
+.if !target(gprbuild-install)
+.PHONY: gprbuild-install
+gprbuild-install:
+       @for dir in ${INSTALL_DIRS}; do \
+           set -e; \
+           cd $$dir && \
+               ${PKGSRC_SETENV} ${GPRINSTALL_ENV} \
+               ${GPRINSTALL_TOOL} ${GPRINSTALL_ARGS} ${GPRBUILD_PROJECT_FILE}; \
+       done
+.endif

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb
diff -u /dev/null pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb:1.1
--- /dev/null   Thu Feb  6 11:27:50 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb       Thu Feb  6 11:27:49 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gpr_src_gpr-util-put__resource__usage____unix.adb,v 1.1 2025/02/06 11:27:49 wiz Exp $
+
+Fix warning at link stage on NetBSD
+
+--- gpr/src/gpr-util-put_resource_usage__unix.adb.orig 2023-10-09 21:31:11.000000000 +0300
++++ gpr/src/gpr-util-put_resource_usage__unix.adb      2024-05-07 10:36:42.700699231 +0300
+@@ -69,7 +69,7 @@
+       procedure Print (This : STC.Timeval);
+ 
+       function Getrusage (Who : Integer; usage : out Rusage) return Integer
+-        with Import, Convention => C;
++        with Import, Convention => C, External_Name => "__netbsd_getrusage";
+ 
+       -----------
+       -- Print --

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index