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 Sep 13 10:59:08 2024 +0300
Changeset: 71a5cf546caac08b4d2e06719a5d7ff4f97422a5
Modified Files:
gprbuild/Makefile
gprbuild/buildlink3.mk
gprbuild/distinfo
gprbuild/files/buildlink.cgpr
gprbuild/gprbuild.mk
gprbuild/patches/patch-bootstrap.sh
gprbuild/patches/patch-gpr_src_gpr-version.ads
Added Files:
gprbuild/COMMIT_MSG
Removed Files:
gprbuild/version.mk
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
* Runpath handling fixes
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=71a5cf546caac08b4d2e06719a5d7ff4f97422a5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gprbuild/COMMIT_MSG | 7 +++++++
gprbuild/Makefile | 4 ++--
gprbuild/buildlink3.mk | 14 ++++++++++++--
gprbuild/distinfo | 4 ++--
gprbuild/files/buildlink.cgpr | 8 +-------
gprbuild/gprbuild.mk | 4 +---
gprbuild/patches/patch-bootstrap.sh | 4 ++--
gprbuild/patches/patch-gpr_src_gpr-version.ads | 2 +-
gprbuild/version.mk | 3 ---
9 files changed, 28 insertions(+), 22 deletions(-)
diffs:
diff --git a/gprbuild/COMMIT_MSG b/gprbuild/COMMIT_MSG
new file mode 100644
index 0000000000..d48ea3c501
--- /dev/null
+++ b/gprbuild/COMMIT_MSG
@@ -0,0 +1,7 @@
+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
+* New gprbuild.mk file for packages that use only gprbuild
+ for building
+* Runpath handling fixes
diff --git a/gprbuild/Makefile b/gprbuild/Makefile
index 5b4c5128a2..f47891abaf 100644
--- a/gprbuild/Makefile
+++ b/gprbuild/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2024/03/19 13:20:35 wiz Exp $
-.include "version.mk"
+GPRBUILD_VERSION:= 24.0.0
DISTNAME= gprbuild-${GPRBUILD_VERSION}
PKGREVISION= 3
@@ -60,7 +60,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.0,g'
+SUBST_SED.fixver= -e 's,18.0w,24.0w,g'
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
diff --git a/gprbuild/buildlink3.mk b/gprbuild/buildlink3.mk
index 83de98cf54..5b06318e92 100644
--- a/gprbuild/buildlink3.mk
+++ b/gprbuild/buildlink3.mk
@@ -20,11 +20,21 @@ 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
-MAKE_ENV+= GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
-INSTALL_ENV+= GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
+GPRBUILD_OPTIONS+= -R -largs -Wl,-z,origin,-rpath,'$$$$ORIGIN':${LD_RUN_PATH} -gargs
+BUILD_MAKE_FLAGS+= GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
.endif
diff --git a/gprbuild/distinfo b/gprbuild/distinfo
index 52dcc4e0ab..acb50f4ac6 100644
--- a/gprbuild/distinfo
+++ b/gprbuild/distinfo
@@ -10,10 +10,10 @@ BLAKE2s (gprbuild-24.0.0.tar.gz) = d8279a6ae9f2df9fa76fa5eccb9d58a39f0a71cf27773
SHA512 (gprbuild-24.0.0.tar.gz) = 09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03
Size (gprbuild-24.0.0.tar.gz) = 959615 bytes
SHA1 (patch-Makefile) = a6fad4177b6537675ca5775c317ad05dbae63c95
-SHA1 (patch-bootstrap.sh) = b76b0694d33c0e099151b96260ad957a07ebb206
+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) = 9321ae482f2f36b9d5a6c96225ae3a7a5e16a7e1
+SHA1 (patch-gpr_src_gpr-version.ads) = a55a6ee4d51e3321d9ed6dc6e69f27049f84003c
SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
SHA1 (patch-gprbuild.gpr) = e943f95bd4681e3cfde3e1782e9ec2efd9cdf181
diff --git a/gprbuild/files/buildlink.cgpr b/gprbuild/files/buildlink.cgpr
index 78fedbb4ba..72b1341687 100644
--- a/gprbuild/files/buildlink.cgpr
+++ b/gprbuild/files/buildlink.cgpr
@@ -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;
@@ -70,7 +66,6 @@ configuration project default is
" 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 PIC_Option ("Ada") use ("-fPIC");
for Leading_Required_Switches ("C") use
@@ -116,12 +111,11 @@ configuration project default is
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");
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";
diff --git a/gprbuild/gprbuild.mk b/gprbuild/gprbuild.mk
index 68ff76a14d..44e35a396c 100644
--- a/gprbuild/gprbuild.mk
+++ b/gprbuild/gprbuild.mk
@@ -39,7 +39,7 @@ GPRBUILD_ENV?= ${MAKE_ENV}
GPRINSTALL_ENV?= ${INSTALL_ENV}
GPRINSTALL_ENV+= ${GPRBUILD_ENV}
-GPRBUILD_ARGS?= -j0 -p
+GPRBUILD_ARGS?= -j0 -p ${GPRBUILD_OPTIONS}
GPRINSTALL_ARGS?= --mode=usage -p --prefix=${DESTDIR}${PREFIX}
GPRBUILD_TOOL= gprbuild
@@ -69,5 +69,3 @@ gprbuild-install:
${GPRINSTALL_TOOL} ${GPRINSTALL_ARGS} ${GPRBUILD_PROJECT_FILE}; \
done
.endif
-
-#.endif
diff --git a/gprbuild/patches/patch-bootstrap.sh b/gprbuild/patches/patch-bootstrap.sh
index 2f14aeb45d..3cd6804153 100644
--- a/gprbuild/patches/patch-bootstrap.sh
+++ b/gprbuild/patches/patch-bootstrap.sh
@@ -1,9 +1,9 @@
-$NetBSD: patch-bootstrap.sh,v 1.2 2024/05/07 15:30:00 dkazankov Exp $
+$NetBSD: patch-bootstrap.sh,v 1.3 2024/08/01 16:00:00 dkazankov Exp $
Fix out-of-tree bootstrap build
--- bootstrap.sh.orig 2023-10-09 21:31:11.000000000 +0300
-+++ bootstrap.sh 2024-05-07 15:49:52.531377055 +0300
++++ 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
diff --git a/gprbuild/patches/patch-gpr_src_gpr-version.ads b/gprbuild/patches/patch-gpr_src_gpr-version.ads
index 5ea2f3ca1f..e7384734aa 100644
--- a/gprbuild/patches/patch-gpr_src_gpr-version.ads
+++ b/gprbuild/patches/patch-gpr_src_gpr-version.ads
@@ -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";
diff --git a/gprbuild/version.mk b/gprbuild/version.mk
deleted file mode 100644
index a41ca980a5..0000000000
--- a/gprbuild/version.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: version.mk,v 1.1 2024/03/12 17:50:12 wiz Exp $
-
-GPRBUILD_VERSION:= 24.0.0
Home |
Main Index |
Thread Index |
Old Index