pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

devel/gprbuild: Update to 24.0.0nb3



Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Fri May 31 23:31:08 2024 +0300
Changeset:	0a41f7b4220673d541622fa19c81f20cfc787932

Modified Files:
	gprbuild/Makefile
	gprbuild/files/buildlink.cgpr

Log Message:
devel/gprbuild: Update to 24.0.0nb3

* Removed unnecessary fixed links to Ada RTS in bootstrap build
  so package can be built with newer GNAT versions

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0a41f7b4220673d541622fa19c81f20cfc787932

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

diffstat:
 gprbuild/Makefile             |  2 +-
 gprbuild/files/buildlink.cgpr | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs:
diff --git a/gprbuild/Makefile b/gprbuild/Makefile
index d8fdbd3b5b..5b4c5128a2 100644
--- a/gprbuild/Makefile
+++ b/gprbuild/Makefile
@@ -3,7 +3,7 @@
 .include "version.mk"
 
 DISTNAME=	gprbuild-${GPRBUILD_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
diff --git a/gprbuild/files/buildlink.cgpr b/gprbuild/files/buildlink.cgpr
index b7b9f9fb83..78fedbb4ba 100644
--- a/gprbuild/files/buildlink.cgpr
+++ b/gprbuild/files/buildlink.cgpr
@@ -25,8 +25,8 @@ configuration project default is
    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";
+   --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 "";
@@ -69,8 +69,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");
+        --& ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
       for PIC_Option ("Ada") use ("-fPIC");
         
       for Leading_Required_Switches   ("C") use
@@ -115,8 +115,8 @@ 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");
+        --& ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
    end Binder;
    
    package Linker is


Home | Main Index | Thread Index | Old Index