pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gprbuild: Update to 25.0.0

Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Wed Nov 27 23:35:13 2024 +0200
Changeset:	9544a4dabbb0ff73c3b853096d04b403ee13487b

Modified Files:
	gprbuild/COMMIT_MSG
	gprbuild/Makefile
	gprbuild/PLIST
	gprbuild/buildlink3.mk
	gprbuild/distinfo
	gprbuild/patches/patch-gpr_src_gpr-version.ads

Log Message:
gprbuild: Update to 25.0.0

* Package updated to version 25.0.0
* Problems with dynamic libraries building solved

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

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

diffstat:
 gprbuild/COMMIT_MSG                            |  8 ++------
 gprbuild/Makefile                              |  9 ++++-----
 gprbuild/PLIST                                 |  1 +
 gprbuild/buildlink3.mk                         |  8 ++------
 gprbuild/distinfo                              | 20 ++++++++++----------
 gprbuild/patches/patch-gpr_src_gpr-version.ads |  6 +++---
 6 files changed, 22 insertions(+), 30 deletions(-)

diffs:
diff --git a/gprbuild/COMMIT_MSG b/gprbuild/COMMIT_MSG
index d48ea3c501..e37ca746ac 100644
--- a/gprbuild/COMMIT_MSG
+++ b/gprbuild/COMMIT_MSG
@@ -1,7 +1,3 @@
-devel/gprbuild: Update to 24.0.0nb3
+devel/gprbuild: Update to 25.0.0
 
-* 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
+* Major release update
diff --git a/gprbuild/Makefile b/gprbuild/Makefile
index f47891abaf..171cce3fca 100644
--- a/gprbuild/Makefile
+++ b/gprbuild/Makefile
@@ -1,9 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2024/03/19 13:20:35 wiz Exp $
 
-GPRBUILD_VERSION:=	24.0.0
-
-DISTNAME=	gprbuild-${GPRBUILD_VERSION}
-PKGREVISION=	3
+DISTNAME=	gprbuild-25.0.0
 CATEGORIES=	devel
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
@@ -60,7 +57,7 @@ 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'
+SUBST_SED.fixver=		-e 's,18.0w,25.0w,g'
 
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
@@ -68,6 +65,8 @@ GENERATE_PLIST+= \
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "../../wip/gcc14-gnat/gcc.mk"
+
 pre-configure:
 	${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${WRKDIR}/
 	${RUN} ${MKDIR} ${OBJDIR}
diff --git a/gprbuild/PLIST b/gprbuild/PLIST
index 4c73c27738..9642ee9cb5 100644
--- a/gprbuild/PLIST
+++ b/gprbuild/PLIST
@@ -149,6 +149,7 @@ share/gprconfig/fortran.xml
 share/gprconfig/gnat.xml
 share/gprconfig/gprconfig.xsd
 share/gprconfig/linker.xml
+share/gprconfig/morello-vx7r2.xml
 share/gprconfig/nocompiler.xml
 share/gprconfig/ppc-vx6.xml
 share/gprconfig/ppc-vx653.xml
diff --git a/gprbuild/buildlink3.mk b/gprbuild/buildlink3.mk
index 5b06318e92..a14b6bea6c 100644
--- a/gprbuild/buildlink3.mk
+++ b/gprbuild/buildlink3.mk
@@ -27,13 +27,9 @@ 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
+LDFLAGS+=	${COMPILER_RPATH_FLAG}'$$$$ORIGIN'
 
-GPRBUILD_OPTIONS+=	-R -largs -Wl,-z,origin,-rpath,'$$$$ORIGIN':${LD_RUN_PATH} -gargs
+GPRBUILD_OPTIONS+=	-eL -R -largs $${LDFLAGS} -gargs
 BUILD_MAKE_FLAGS+=	GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
 
 .endif
diff --git a/gprbuild/distinfo b/gprbuild/distinfo
index acb50f4ac6..6a8b80d414 100644
--- a/gprbuild/distinfo
+++ b/gprbuild/distinfo
@@ -1,19 +1,19 @@
 $NetBSD: distinfo,v 1.2 2024/03/19 13:20:35 wiz Exp $
 
-BLAKE2s (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = e39c1e70b80923db53f0e6c4687536fcbfdc951209a34dc039423f9cc31319fa
-SHA512 (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
-Size (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = 43010 bytes
-BLAKE2s (AdaCore-xmlada-v24.0.0.tar.gz) = a02dae17a91d326f06fc85e9b69ee5bfe181ab97ca3f7e3a846b71bc5928b643
-SHA512 (AdaCore-xmlada-v24.0.0.tar.gz) = 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d
-Size (AdaCore-xmlada-v24.0.0.tar.gz) = 1053363 bytes
-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
+BLAKE2s (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = eb32df0aa23a0ba4c8bcc88a580a06887ff7b12efc87bb0eac9b4d292ec548a6
+SHA512 (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
+Size (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = 44165 bytes
+BLAKE2s (AdaCore-xmlada-v25.0.0.tar.gz) = c7e2b06977998dadbde002a6b80a75d3921860f20946c02a983a2048ade6e987
+SHA512 (AdaCore-xmlada-v25.0.0.tar.gz) = c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0
+Size (AdaCore-xmlada-v25.0.0.tar.gz) = 1082553 bytes
+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-bootstrap.sh) = 0f8fa38605225385975291a4d62d22a77762813f
 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
-SHA1 (patch-gpr_src_gpr-version.ads) = a55a6ee4d51e3321d9ed6dc6e69f27049f84003c
+SHA1 (patch-gpr_src_gpr-version.ads) = 40deea3a0eb6cf6a3fda3ed8ed898d4daabe0423
 SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
 SHA1 (patch-gprbuild.gpr) = e943f95bd4681e3cfde3e1782e9ec2efd9cdf181
diff --git a/gprbuild/patches/patch-gpr_src_gpr-version.ads b/gprbuild/patches/patch-gpr_src_gpr-version.ads
index e7384734aa..ccb4d02254 100644
--- a/gprbuild/patches/patch-gpr_src_gpr-version.ads
+++ b/gprbuild/patches/patch-gpr_src_gpr-version.ads
@@ -9,14 +9,14 @@ Fix incorrect version reporting
  package GPR.Version is
  
 -   Gpr_Version : constant String := "18.0w";
-+   Gpr_Version : constant String := "24.0w";
++   Gpr_Version : constant String := "25.0w";
     --  Static string identifying this version
  
 -   Date : constant String := "19940713";
-+   Date : constant String := "20231113";
++   Date : constant String := "20241126";
  
 -   Current_Year : constant String := "2016";
-+   Current_Year : constant String := "2023";
++   Current_Year : constant String := "2024";
  
     type Gnat_Build_Type is (Gnatpro, FSF, GPL);
     --  See Get_Gnat_Build_Type below for the meaning of these values
Home | Main Index | Thread Index | Old Index