pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnatcoll-core: change dependencies
Module Name: pkgsrc-wip
Committed By: Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By: dkazankov
Date: Mon Feb 10 23:09:56 2025 +0200
Changeset: 53204a83a93c21c1c2580953eb674c117e0e334b
Modified Files:
gnatcoll-core/Makefile
gnatcoll-core/distinfo
gnatcoll-core/patches/patch-Makefile
gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
gnatcoll-core/patches/patch-gprproject_____init____.py
Added Files:
gnatcoll-core/patches/patch-gprproject_gprbuild.py
Log Message:
gnatcoll-core: change dependencies
* Dependencies changed to updated main pkgsrc's gcc13-gnat and gprbuild
* GPRBuild related issues solved
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=53204a83a93c21c1c2580953eb674c117e0e334b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnatcoll-core/Makefile | 16 +++++----
gnatcoll-core/distinfo | 5 +--
gnatcoll-core/patches/patch-Makefile | 38 +++++++++++++++++++---
.../patches/patch-core_gnatcoll__core.gpr | 2 +-
.../patches/patch-gprproject_____init____.py | 25 +++++++++++++-
gnatcoll-core/patches/patch-gprproject_gprbuild.py | 37 +++++++++++++++++++++
6 files changed, 109 insertions(+), 14 deletions(-)
diffs:
diff --git a/gnatcoll-core/Makefile b/gnatcoll-core/Makefile
index 2e2af53f75..c5d3bc53b1 100644
--- a/gnatcoll-core/Makefile
+++ b/gnatcoll-core/Makefile
@@ -11,19 +11,27 @@ HOMEPAGE= https://github.com/AdaCore/gnatcoll-core
COMMENT= The GNAT Components Collection (GNATcoll) - Core packages
LICENSE= gnu-gpl-v3
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake grep
.include "../../mk/bsd.prefs.mk"
USE_LANGUAGES= c ada
+GCC_REQD+= 13
+
MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD ENABLE_SHARED=yes
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
-.include "../../wip/gcc14-gnat-libs/buildlink3.mk"
+.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
+.include "../../devel/gprbuild/buildlink3.mk"
+
+# These lines must be after previous include
+GPRBUILD_OPTIONS+= --config=default.cgpr
+GPRINSTALL_OPTIONS+= --config=default.cgpr
+BUILD_MAKE_FLAGS+= GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}
BUILDLINK_DEPMETHOD.xmlada= full
.include "../../wip/xmlada/buildlink3.mk"
@@ -31,10 +39,6 @@ BUILDLINK_DEPMETHOD.xmlada= full
BUILDLINK_DEPMETHOD.gprlib= full
.include "../../wip/gprlib/buildlink3.mk"
-.include "../../wip/gprbuild/buildlink3.mk"
-
-.include "../../wip/gcc14-gnat/gcc.mk"
-
PYTHON_VERSIONS_ACCEPTED= 312 311 310 39 38 27
.include "../../lang/python/tool.mk"
diff --git a/gnatcoll-core/distinfo b/gnatcoll-core/distinfo
index 134613ea0d..5c2e70a540 100644
--- a/gnatcoll-core/distinfo
+++ b/gnatcoll-core/distinfo
@@ -3,10 +3,11 @@ $NetBSD$
BLAKE2s (gnatcoll-core-25.0.0.tar.gz) = 4e3053b10a27ea4bd4fc1c8ba2e8ab936087507f8969e9c71b33c0fbb5a81a4c
SHA512 (gnatcoll-core-25.0.0.tar.gz) = efa19b9760bd16b402445d4932dfd28f087f9a09b91ec688c6976b7b83fe5986580b1871378ac024e9a712df8ee75963e5dc88629a72ee1ce76f1d1403b8e122
Size (gnatcoll-core-25.0.0.tar.gz) = 7492612 bytes
-SHA1 (patch-Makefile) = c8dda6bbc8f3b824fa9e35bc19634ff155111006
+SHA1 (patch-Makefile) = 5a6a41fadcd84fa0eda5122263fbb3dee601b546
SHA1 (patch-core_gnatcoll__core.gpr) = f1d8d2ff72e78d9874cbf6a2ec41e3a0e46b30a8
SHA1 (patch-core_src_executable__path.c) = a4105333ea497cae722b2870149725f69de2dbe9
SHA1 (patch-core_src_os_unix_gnatcoll-os-libc-dirent.ads) = dc238de627d978674579af1e9a5c7b9d6120041a
SHA1 (patch-core_src_os_unix_libc-wrappers.c) = 36e42ff1379e610c6194c0d60f5aa72329afe54b
SHA1 (patch-core_src_os_unix_process-wrappers.c) = ef3696e8098b9ca434a83093aa53698c578fd0cc
-SHA1 (patch-gprproject_____init____.py) = 6a25cd79899650b532b1b4343aaae51a06a6a911
+SHA1 (patch-gprproject_____init____.py) = ac5ac38f93b4b6e11627aecc2cca84e3d3d6c4e6
+SHA1 (patch-gprproject_gprbuild.py) = 96bbf5565e72465da06e53c1eb38c81f1e3c3af7
diff --git a/gnatcoll-core/patches/patch-Makefile b/gnatcoll-core/patches/patch-Makefile
index 5f5800c70e..87b10089da 100644
--- a/gnatcoll-core/patches/patch-Makefile
+++ b/gnatcoll-core/patches/patch-Makefile
@@ -1,21 +1,51 @@
$NetBSD: patch-Makefile,v 1.0 2024/11/27 11:00:00 dkazankov Exp $
+Fix target calculation
Add necessary parameters for pkgsrc build
Fix destdir building in rsync absence
--- Makefile.orig 2024-09-24 12:28:32.000000000 +0300
-+++ Makefile 2024-11-27 13:11:31.400017372 +0200
-@@ -99,7 +99,8 @@
++++ Makefile
+@@ -61,7 +61,7 @@
+ GNATCOLL_GPR=$(SOURCE_DIR)/gnatcoll.gpr
+
+ TARGET := $(shell gcc -dumpmachine)
+-NORMALIZED_TARGET := $(subst normalized_target:,,$(wordlist 6,6,$(shell gprconfig --config=ada --target=$(TARGET) --mi-show-compilers)))
++NORMALIZED_TARGET := $(lastword $(subst :, ,$(shell gprconfig --config=ada --target=$(TARGET) --mi-show-compilers | grep ' 1 normalized_target:')))
+ ifeq ($(NORMALIZED_TARGET),)
+ $(error No toolchain found for target "$(TARGET)")
+ endif
+@@ -98,8 +98,13 @@
+ --build=$(BUILD) \
--target=$(NORMALIZED_TARGET) \
--prefix=local-install \
- --install \
+- --install \
- --enable-shared=$(ENABLE_SHARED)
+ --enable-shared=$(ENABLE_SHARED) \
++ --add-gpr-path='./minimal,./core,./projects' \
+ --gpr-opts $(GPRBUILD_OPTIONS)
++
++INSTALL_ARGS= \
++ --prefix=local-install \
++ --gpr-opts $(GPRINSTALL_OPTIONS)
build:
rm -rf local-install
-@@ -123,7 +124,7 @@
+@@ -112,18 +117,21 @@
+ endif
+
+ $(PYTHON) $(SOURCE_DIR)/minimal/gnatcoll_minimal.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS)
++ $(PYTHON) $(SOURCE_DIR)/minimal/gnatcoll_minimal.gpr.py install $(INSTALL_ARGS)
+
+ ifeq ($(GNATCOLL_MINIMAL_ONLY), no)
+ $(PYTHON) $(SOURCE_DIR)/core/gnatcoll_core.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS)
++ $(PYTHON) $(SOURCE_DIR)/core/gnatcoll_core.gpr.py install $(INSTALL_ARGS)
+ endif
+
+ ifeq ($(GNATCOLL_PROJECTS), yes)
+ $(PYTHON) $(SOURCE_DIR)/projects/gnatcoll_projects.gpr.py build $(INSTR_BUILD_OPTS) $(BUILD_ARGS)
++ $(PYTHON) $(SOURCE_DIR)/projects/gnatcoll_projects.gpr.py install $(INSTALL_ARGS)
+ endif
install:
@echo "Installing gnatcoll into $(prefix)"
diff --git a/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr b/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
index 45044e426b..5a23b6c8c8 100644
--- a/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
+++ b/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
@@ -1,4 +1,4 @@
-$NetBSD: patch-gnatcoll.gpr,v 1.0 2024/05/17 18:00:00 dkazankov Exp $
+$NetBSD: patch-core_gnatcoll__core.gpr,v 1.0 2024/05/17 18:00:00 dkazankov Exp $
Fix extra libs on NetBSD
Fix RELRO options on NetBSD
diff --git a/gnatcoll-core/patches/patch-gprproject_____init____.py b/gnatcoll-core/patches/patch-gprproject_____init____.py
index 6879a385c9..f1d7a9082e 100644
--- a/gnatcoll-core/patches/patch-gprproject_____init____.py
+++ b/gnatcoll-core/patches/patch-gprproject_____init____.py
@@ -3,7 +3,7 @@ $NetBSD: patch-gprproject_____init____.py,v 1.0 2024/11/27 11:00:00 dkazankov Ex
Fix parameters throughput
--- gprproject/__init__.py.orig 2024-09-24 12:28:32.000000000 +0300
-+++ gprproject/__init__.py 2024-11-27 14:33:44.097637432 +0200
++++ gprproject/__init__.py
@@ -173,7 +173,7 @@
print(f'{var:<32} := "{value}";')
@@ -13,3 +13,26 @@ Fix parameters throughput
if status == 0 and args.install:
status = gpr.install([])
return status
+@@ -182,19 +182,19 @@
+
+ def clean(self, args):
+ gpr = GPRTool.load(self.project_file)
+- return gpr.clean([])
++ return gpr.clean(args.gpr_opts)
+
+ def install(self, args):
+ gpr = GPRTool.load(self.project_file)
+ if args.prefix:
+ gpr.prefix = os.path.abspath(args.prefix)
+- return gpr.install([])
++ return gpr.install(args.gpr_opts)
+
+ def uninstall(self, args):
+ gpr = GPRTool.load(self.project_file)
+ if args.prefix:
+ gpr.prefix = os.path.abspath(args.prefix)
+- return gpr.uninstall([])
++ return gpr.uninstall(args.gpr_opts)
+
+ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
+ """Function to be used by end user to add switch to the build command.
diff --git a/gnatcoll-core/patches/patch-gprproject_gprbuild.py b/gnatcoll-core/patches/patch-gprproject_gprbuild.py
new file mode 100644
index 0000000000..96249671e8
--- /dev/null
+++ b/gnatcoll-core/patches/patch-gprproject_gprbuild.py
@@ -0,0 +1,37 @@
+$NetBSD: patch-gprproject_gprbuild.py,v 1.0 2025/02/10 13:00:00 dkazankov Exp $
+
+Fix duplicate gprconfig call
+
+--- gprproject/gprbuild.py.orig 2024-09-24 12:28:32.000000000 +0300
++++ gprproject/gprbuild.py
+@@ -59,8 +59,14 @@
+ gprconfig_cmd = [which("gprconfig"), "--config=ada", "--mi-show-compilers"]
+ if self.original_target:
+ gprconfig_cmd.append(f"--target={self.original_target}")
+- gprconfig_output = self.capture(gprconfig_cmd)
+- self.target = re.findall(r" 1 normalized_target:(\S*)", gprconfig_output)[0]
++
++ if not target or not prefix:
++ gprconfig_output = self.capture(gprconfig_cmd)
++
++ if target:
++ self.target = target
++ else:
++ self.target = re.findall(r" 1 normalized_target:(\S*)", gprconfig_output)[0]
+
+ # Compute default prefix
+ if prefix:
+@@ -84,9 +90,10 @@
+
+ self.gnatcov = gnatcov
+ self.symcc = symcc
+- self.gpr_paths: list[str] = []
+- if self.gpr_paths:
+- self.gpr_paths = list(gpr_paths)
++ self.gpr_paths = gpr_paths
++ if gpr_paths:
++ if type(gpr_paths) is str:
++ self.gpr_paths: list[str] = gpr_paths.split(",")
+ else:
+ self.gpr_paths = []
+
Home |
Main Index |
Thread Index |
Old Index