pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnatcoll-bindings: change dependencies
Module Name: pkgsrc-wip
Committed By: Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By: dkazankov
Date: Mon Feb 10 23:11:57 2025 +0200
Changeset: 43636b840322799f6c5164f279309c2cf399ca98
Modified Files:
gnatcoll-bindings/Makefile
gnatcoll-bindings/distinfo
gnatcoll-bindings/patches/patch-Makefile
Added Files:
gnatcoll-bindings/patches/patch-setup__support.py
Removed Files:
gnatcoll-bindings/patches/patch-version_information
Log Message:
gnatcoll-bindings: 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=43636b840322799f6c5164f279309c2cf399ca98
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnatcoll-bindings/Makefile | 20 +++++++----
gnatcoll-bindings/distinfo | 4 +--
gnatcoll-bindings/patches/patch-Makefile | 6 ++--
gnatcoll-bindings/patches/patch-setup__support.py | 42 ++++++++++++++++++++++
.../patches/patch-version_information | 9 -----
5 files changed, 61 insertions(+), 20 deletions(-)
diffs:
diff --git a/gnatcoll-bindings/Makefile b/gnatcoll-bindings/Makefile
index dda29456fa..05a5d708fc 100644
--- a/gnatcoll-bindings/Makefile
+++ b/gnatcoll-bindings/Makefile
@@ -11,12 +11,20 @@ HOMEPAGE= https://github.com/AdaCore/gnatcoll-bindings
COMMENT= The GNAT Components Collection (GNATcoll) - Bindings
LICENSE= gnu-gpl-v3
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake grep
.include "../../mk/bsd.prefs.mk"
USE_LANGUAGES= c cpp ada
+GCC_REQD+= 13
+
+SUBST_CLASSES+= fixver
+SUBST_STAGE.fixver= pre-configure
+SUBST_FILES.fixver= version_information
+SUBST_SED.fixver= -e 's,0.0,25.0,g'
+SUBST_MESSAGE.fixver= Fix version information
+
.include "options.mk"
MAKE_FLAGS+= BINDINGS=${BINDINGS:Q}
@@ -26,7 +34,11 @@ 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"
+
+GPRBUILD_OPTIONS+= --config=../default.cgpr
+GPRINSTALL_OPTIONS+= --config=../default.cgpr
BUILDLINK_DEPMETHOD.xmlada= full
.include "../../wip/xmlada/buildlink3.mk"
@@ -37,10 +49,6 @@ BUILDLINK_DEPMETHOD.gprlib= full
BUILDLINK_DEPMETHOD.gnatcoll-core= full
.include "../../wip/gnatcoll-core/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-bindings/distinfo b/gnatcoll-bindings/distinfo
index b59431f3c6..68ecee7213 100644
--- a/gnatcoll-bindings/distinfo
+++ b/gnatcoll-bindings/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
BLAKE2s (gnatcoll-bindings-25.0.0.tar.gz) = 9b494fc8ac73012d939a6b8764242dd94462e1d3253aabd809ebb5e275e8e08d
SHA512 (gnatcoll-bindings-25.0.0.tar.gz) = 0cc5b4a1e966b6e05dcfa15e60cb3960894ffe73b9348f0642a972f4d517e535c617893a4080d33095ee62779b14aeb6cdd8a8f0a8b5a6c8e81c94df132420b2
Size (gnatcoll-bindings-25.0.0.tar.gz) = 299443 bytes
-SHA1 (patch-Makefile) = cd5df0d7a8231870a933cdf54ad801bb995986be
-SHA1 (patch-version_information) = e1d2fe8e1039d3d1855b8ad208ca5d94a08628f4
+SHA1 (patch-Makefile) = 28b966edeb5e3edb6b53ff09c34d40a518daa119
+SHA1 (patch-setup__support.py) = c91171307d3d7781111c89ba3a38ced019eab4e2
diff --git a/gnatcoll-bindings/patches/patch-Makefile b/gnatcoll-bindings/patches/patch-Makefile
index 27450ff865..5b91e2f1f2 100644
--- a/gnatcoll-bindings/patches/patch-Makefile
+++ b/gnatcoll-bindings/patches/patch-Makefile
@@ -2,8 +2,8 @@ $NetBSD: patch-Makefile,v 1.0 2024/05/13 21:00:00 dkazankov Exp $
Create Makefile for build
---- /dev/null 2024-05-14 08:52:29.834622612 +0300
-+++ Makefile 2024-05-14 08:56:41.606792235 +0300
+--- /dev/null
++++ Makefile
@@ -0,0 +1,69 @@
+prefix ?= $(dir $(shell $(WHICH) gnatls))..
+ENABLE_SHARED ?= yes
@@ -14,7 +14,7 @@ Create Makefile for build
+
+BINDINGS ?= gmp iconv lzma omp python python3 readline syslog zlib
+
-+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
diff --git a/gnatcoll-bindings/patches/patch-setup__support.py b/gnatcoll-bindings/patches/patch-setup__support.py
new file mode 100644
index 0000000000..bb0c23dd75
--- /dev/null
+++ b/gnatcoll-bindings/patches/patch-setup__support.py
@@ -0,0 +1,42 @@
+$NetBSD: patch-setup__support.py,v 1.0 2025/02/10 19:00:00 dkazankov Exp $
+
+Fix gprconfig calls
+
+--- setup_support.py.orig 2024-07-11 14:49:55.000000000 +0300
++++ setup_support.py
+@@ -135,24 +135,25 @@
+ if args.target is None:
+ self.data['target'] = self.run('gcc', '-dumpmachine',
+ grab=True)
++ self.data['canonical_target'] = self.run(
++ 'gprconfig', '--config=ada',
++ '--target=%s' % self.data['target'],
++ '--mi-show-compilers',
++ grab=r' 1 normalized_target:(\S*)')
+ else:
+ self.data['target'] = args.target
++ self.data['canonical_target'] = args.target
+
+ self.data['jobs'] = args.jobs
+ self.data['integrated'] = args.integrated
+- self.data['canonical_target'] = self.run(
+- 'gprconfig', '--config=ada',
+- '--target=%s' % self.data['target'],
+- '--mi-show-compilers',
+- grab=r' 1 normalized_target:(\S*)')
+-
+- default_prefix = os.path.dirname(
+- os.path.dirname(
+- self.run('gprconfig', '--config=ada',
++
++ if args.prefix == 'auto':
++ default_prefix = os.path.dirname(
++ os.path.dirname(
++ self.run('gprconfig', '--config=ada',
+ '--target=%s' % self.data['target'],
+ '--mi-show-compilers',
+ grab=r' 1 path:(.*)')))
+- if args.prefix == 'auto':
+ self.data['prefix'] = default_prefix
+ else:
+ self.data['prefix'] = args.prefix
diff --git a/gnatcoll-bindings/patches/patch-version_information b/gnatcoll-bindings/patches/patch-version_information
deleted file mode 100644
index 96c7ab4a97..0000000000
--- a/gnatcoll-bindings/patches/patch-version_information
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-version_information,v 1.0 2024/05/06 14:00:00 dkazankov Exp $
-
-Set version information
-
---- version_information.orig 2023-09-21 18:57:14.000000000 +0300
-+++ version_information
-@@ -1 +1 @@
--0.0
-+25.0
Home |
Main Index |
Thread Index |
Old Index