gnatcoll-db: change dependencies (unfinished)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnatcoll-db: change dependencies (unfinished)
From: Dmytro Kazankov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 11 Feb 2025 06:47:46 +0000
Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Tue Feb 11 08:39:51 2025 +0200
Changeset:	856d8309dbe185a93bd16428bdf15a39c2c3668c

Modified Files:
	gnatcoll-db/Makefile
	gnatcoll-db/distinfo
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
	gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
	gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
	gnatcoll-db/patches/patch-postgres_Makefile
	gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
	gnatcoll-db/patches/patch-sql_Makefile
	gnatcoll-db/patches/patch-sqlite_Makefile
	gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
	gnatcoll-db/patches/patch-xref_Makefile
	gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr
Added Files:
	gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile
	gnatcoll-db/patches/patch-gnatinspect_Makefile
Removed Files:
	gnatcoll-db/patches/patch-version_information

Log Message:
gnatcoll-db: change dependencies (unfinished)

* Dependencies changed to updated main pkgsrc's gcc13-gnat and gprbuild
* GPRBuild related issues solved
* Some other package dependencies are still in development

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

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

diffstat:
 gnatcoll-db/Makefile                               | 20 +++++++++-----
 gnatcoll-db/distinfo                               | 27 ++++++++++---------
 .../patches/patch-gnatcoll__db2ada_Makefile        | 31 ++++++++++++++++++++++
 .../patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr   |  2 +-
 .../patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr    |  2 +-
 ...tch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr |  2 +-
 ...patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr |  2 +-
 gnatcoll-db/patches/patch-gnatinspect_Makefile     | 31 ++++++++++++++++++++++
 .../patches/patch-gnatinspect_gnatinspect.gpr      |  2 +-
 gnatcoll-db/patches/patch-postgres_Makefile        | 30 +++++++++++++++++++--
 .../patches/patch-postgres_gnatcoll__postgres.gpr  | 14 ++++++++--
 gnatcoll-db/patches/patch-sql_Makefile             | 30 +++++++++++++++++++--
 gnatcoll-db/patches/patch-sqlite_Makefile          | 30 +++++++++++++++++++--
 .../patches/patch-sqlite_gnatcoll__sqlite.gpr      |  2 +-
 gnatcoll-db/patches/patch-version_information      |  9 -------
 gnatcoll-db/patches/patch-xref_Makefile            | 30 +++++++++++++++++++--
 gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr  |  2 +-
 17 files changed, 221 insertions(+), 45 deletions(-)

diffs:
diff --git a/gnatcoll-db/Makefile b/gnatcoll-db/Makefile
index a4d447f8f5..7fb8c457ab 100644
--- a/gnatcoll-db/Makefile
+++ b/gnatcoll-db/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/AdaCore/gnatcoll-db
 COMMENT=	The GNAT Components Collection (GNATcoll) - Database packages
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake grep
 
 HAS_CONFIGURE=	yes
 
@@ -21,6 +21,14 @@ CHECK_PIE_SKIP+=	bin/*
 
 USE_LANGUAGES=	c 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"
 
 CONFIG_SHELL_FLAGS+=	prefix=${DESTDIR}${PREFIX} BUILD=PROD
@@ -121,7 +129,11 @@ GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 	${FIND} bin 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"
@@ -132,8 +144,4 @@ 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"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnatcoll-db/distinfo b/gnatcoll-db/distinfo
index c31c3f016d..befa029692 100644
--- a/gnatcoll-db/distinfo
+++ b/gnatcoll-db/distinfo
@@ -3,16 +3,17 @@ $NetBSD$
 BLAKE2s (gnatcoll-db-25.0.0.tar.gz) = 644f89eca578ab538daf7c90317a89cfa4736632f141e2d7db5a413d39c0c297
 SHA512 (gnatcoll-db-25.0.0.tar.gz) = 7cd37d33650a16fd72796adda375a62a6368c11b369209686194fe96ad72a8e49094076679824266f88aeb7b1bc592ac1be678fcfaad10b59c7e05f7dd512cf3
 Size (gnatcoll-db-25.0.0.tar.gz) = 2688678 bytes
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr) = e7eeace9f2cfa4e700672e77d50dc803d1158f2b
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr) = 3178dbd902c02c58a701c8b31438954a7e6b9f15
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr) = f3d13b8e5980b2080fbef520b9a72877d01186cd
-SHA1 (patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr) = f576c92cb92a6f4535c4693db4a579885555207c
-SHA1 (patch-gnatinspect_gnatinspect.gpr) = 6c3e65e4af79e879ddd88ef7cc9cc1598b63299d
-SHA1 (patch-postgres_Makefile) = 818f2e48d763dea72cf5a93338ab6db8eae62cdb
-SHA1 (patch-postgres_gnatcoll__postgres.gpr) = 4300d92c882ab1d59675da4aba206bfebf6e19b6
-SHA1 (patch-sql_Makefile) = d275d66ae519298126b13e9186bb9fd9e6ad5404
-SHA1 (patch-sqlite_Makefile) = ce545bcad501d86e9dda5d267cbb82a53e2d62c2
-SHA1 (patch-sqlite_gnatcoll__sqlite.gpr) = 54798487954cc9a8651ffb7d658ccc3196c22ae3
-SHA1 (patch-version_information) = e1d2fe8e1039d3d1855b8ad208ca5d94a08628f4
-SHA1 (patch-xref_Makefile) = 5143f4f6666788eea72653b15b16c64a3ce8e5d2
-SHA1 (patch-xref_gnatcoll__xref.gpr) = 2a2379aa77eb04ce452787109a54611f86e7a0e6
+SHA1 (patch-gnatcoll__db2ada_Makefile) = dbcec198253c682b952ecdbac4e839eb335c97ec
+SHA1 (patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr) = e6198437023047531952e4e2c785d84b310382b3
+SHA1 (patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr) = 4e14ba5302d45b5999e536071fddabebc8066711
+SHA1 (patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr) = efbc99b713ce6d61fecd5e2971fb51dc7177c7cb
+SHA1 (patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr) = fb3b09094980a73dc010a5e685604b97e228658d
+SHA1 (patch-gnatinspect_Makefile) = cdf67afd640ca9d42f7c35045caed60c5d16c303
+SHA1 (patch-gnatinspect_gnatinspect.gpr) = e50ec2270c6cd416d3d425cba78f34b9db9fe79f
+SHA1 (patch-postgres_Makefile) = 4ef37b9c1979e34868a4c6a518120a98e2f12ed2
+SHA1 (patch-postgres_gnatcoll__postgres.gpr) = c02445550583046d15a6e5611cb363db90964463
+SHA1 (patch-sql_Makefile) = 28d5eb0f5477afd97781d7256b2505cce5cb313a
+SHA1 (patch-sqlite_Makefile) = f914c22128c5c349b9bec0df544dca66c357c65e
+SHA1 (patch-sqlite_gnatcoll__sqlite.gpr) = 5e6d0831c12ee6e3ee68206da38c2f85dce86a81
+SHA1 (patch-xref_Makefile) = 03abf42c50ea1f2b070cad0444bf92f2c4b5fd0b
+SHA1 (patch-xref_gnatcoll__xref.gpr) = 5edb779e6a6067b009c0d284f07965465b097da9
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile b/gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile
new file mode 100644
index 0000000000..269e276f15
--- /dev/null
+++ b/gnatcoll-db/patches/patch-gnatcoll__db2ada_Makefile
@@ -0,0 +1,31 @@
+$NetBSD: patch-gnatcoll__db2ada_Makefile,v 1.0 2025/02/10 21:00:00 dkazankov Exp $
+
+Fix target calculation
+Add extra options to gprinstall
+
+--- gnatcoll_db2ada/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
++++ gnatcoll_db2ada/Makefile
+@@ -75,7 +75,7 @@
+ # Load current setup if any
+ -include makefile.setup
+ 
+-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
+@@ -91,11 +91,13 @@
+ 
+ # Used to pass extra options to GPRBUILD, like -d for instance
+ GPRBUILD_OPTIONS=
++GPRINSTALL_OPTIONS=
+ 
+ BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
+ 	$(GPRBUILD_OPTIONS)
+ INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
+-	$(RBD) --mode=usage --no-project --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
++	$(RBD) --mode=usage --no-project --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
++	$(GPRINSTALL_OPTIONS)
+ CLEANER=gprclean -q $(GPR_VARS) $(RBD)
+ UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
+ 
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
index 8e8c538668..319efa138a 100644
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
+++ b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-gnatcoll__db2ada_gnatcoll__all2ada.gpr,v 1.0 2024/07/24 19:00:00
 Fix project paths
 
 --- gnatcoll_db2ada/gnatcoll_all2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_all2ada.gpr	2024-07-24 19:55:53.120387194 +0300
++++ gnatcoll_db2ada/gnatcoll_all2ada.gpr
 @@ -23,9 +23,9 @@
  
  with "../gnatcoll_db_shared.gpr";
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
index 222eccc8d8..7dc4016c71 100644
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
+++ b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-gnatcoll__db2ada_gnatcoll__db2ada.gpr,v 1.0 2024/07/24 19:00:00 d
 Fix project paths
 
 --- gnatcoll_db2ada/gnatcoll_db2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_db2ada.gpr	2024-07-24 19:04:50.327277107 +0300
++++ gnatcoll_db2ada/gnatcoll_db2ada.gpr
 @@ -23,7 +23,7 @@
  
  with "../gnatcoll_db_shared.gpr";
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
index 43ddeb8b40..1b75e61d9b 100644
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
+++ b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-gnatcoll__db2ada_gnatcoll__postgres2ada.gpr,v 1.0 2024/07/24 19:0
 Fix project paths
 
 --- gnatcoll_db2ada/gnatcoll_postgres2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_postgres2ada.gpr	2024-07-24 18:55:39.814325097 +0300
++++ gnatcoll_db2ada/gnatcoll_postgres2ada.gpr
 @@ -23,8 +23,8 @@
  
  with "../gnatcoll_db_shared.gpr";
diff --git a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
index 9aeb2eebba..87b46ba367 100644
--- a/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
+++ b/gnatcoll-db/patches/patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr,v 1.0 2024/07/24 19:00:
 Fix project paths
 
 --- gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr	2024-07-24 18:56:05.410546133 +0300
++++ gnatcoll_db2ada/gnatcoll_sqlite2ada.gpr
 @@ -23,8 +23,8 @@
  
  with "../gnatcoll_db_shared.gpr";
diff --git a/gnatcoll-db/patches/patch-gnatinspect_Makefile b/gnatcoll-db/patches/patch-gnatinspect_Makefile
new file mode 100644
index 0000000000..55b564fbdd
--- /dev/null
+++ b/gnatcoll-db/patches/patch-gnatinspect_Makefile
@@ -0,0 +1,31 @@
+$NetBSD: patch-gnatinspect_Makefile,v 1.0 2025/02/10 21:00:00 dkazankov Exp $
+
+Fix target calculation
+Add extra options to gprinstall
+
+--- gnatinspect/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
++++ gnatinspect/Makefile
+@@ -58,7 +58,7 @@
+ endif
+ 
+ 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
+@@ -88,11 +88,13 @@
+ 
+ # Used to pass extra options to GPRBUILD, like -d for instance
+ GPRBUILD_OPTIONS=
++GPRINSTALL_OPTIONS=
+ 
+ BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
+ 	$(GPRBUILD_OPTIONS)
+ INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
+-	$(RBD) --no-project --mode=usage --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
++	$(RBD) --no-project --mode=usage --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
++	$(GPRINSTALL_OPTIONS)
+ CLEANER=gprclean -q $(GPR_VARS) $(RBD)
+ UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
+ 
diff --git a/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr b/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
index 494b1d322a..cf10ed5a78 100644
--- a/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
+++ b/gnatcoll-db/patches/patch-gnatinspect_gnatinspect.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-gnatinspect_gnatinspect.gpr,v 1.0 2024/07/24 19:00:00 dkazankov E
 Fix project paths
 
 --- gnatinspect/gnatinspect.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ gnatinspect/gnatinspect.gpr	2024-07-24 19:47:06.261997538 +0300
++++ gnatinspect/gnatinspect.gpr
 @@ -23,9 +23,9 @@
  
  with "../gnatcoll_db_shared.gpr";
diff --git a/gnatcoll-db/patches/patch-postgres_Makefile b/gnatcoll-db/patches/patch-postgres_Makefile
index 3667243866..c5b531791b 100644
--- a/gnatcoll-db/patches/patch-postgres_Makefile
+++ b/gnatcoll-db/patches/patch-postgres_Makefile
@@ -1,9 +1,20 @@
 $NetBSD: patch-postgres_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
 
+Fix target calculation
 Fix library types to build
+Add extra options to gprinstall
 
---- postgres/Makefile.orig	2022-09-02 15:43:38.000000000 +0300
-+++ postgres/Makefile	2024-07-24 20:34:07.604188615 +0300
+--- postgres/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
++++ postgres/Makefile
+@@ -66,7 +66,7 @@
+ endif
+ 
+ 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
 @@ -91,7 +91,7 @@
  ifeq ($(ENABLE_SHARED), yes)
     LIBRARY_TYPES=static relocatable static-pic
@@ -13,3 +24,18 @@ Fix library types to build
  endif
  
  ifeq ($(INTEGRATED), yes)
+@@ -105,11 +105,13 @@
+ 
+ # Used to pass extra options to GPRBUILD, like -d for instance
+ GPRBUILD_OPTIONS=
++GPRINSTALL_OPTIONS=
+ 
+ BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
+ 	$(GPRBUILD_OPTIONS)
+ INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
+-	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
++	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
++	$(GPRINSTALL_OPTIONS)
+ CLEANER=gprclean -q $(RBD) $(GPR_VARS)
+ UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
+ 
diff --git a/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr b/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
index 58cc00d5ae..14c31d92eb 100644
--- a/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
+++ b/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
@@ -1,9 +1,10 @@
 $NetBSD: patch-postgres_gnatcoll__postgres.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
 
 Fix project paths
+Add required libraries
 
---- postgres/gnatcoll_postgres.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ postgres/gnatcoll_postgres.gpr	2024-07-24 19:38:37.895285106 +0300
+--- postgres/gnatcoll_postgres.gpr.orig	2023-11-06 12:21:17.000000000 +0200
++++ postgres/gnatcoll_postgres.gpr
 @@ -23,7 +23,7 @@
  
  with "gnatcoll_postgres_conf.gpr";
@@ -13,3 +14,12 @@ Fix project paths
  
  library project GnatColl_Postgres is
  
+@@ -71,7 +71,7 @@
+    package Ide renames GnatColl_Postgres_Conf.Ide;
+ 
+    package Linker is
+-      for Linker_Options use ("-lpq");
++      for Linker_Options use ("-lpq", "-lpgcommon", "-lpgport", "-lssl", "-lcrypto", "-lintl", "-lgssapi");
+    end Linker;
+ 
+ end GnatColl_Postgres;
diff --git a/gnatcoll-db/patches/patch-sql_Makefile b/gnatcoll-db/patches/patch-sql_Makefile
index efa8047a5e..7095b5be3c 100644
--- a/gnatcoll-db/patches/patch-sql_Makefile
+++ b/gnatcoll-db/patches/patch-sql_Makefile
@@ -1,9 +1,20 @@
 $NetBSD: patch-sql_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
 
+Fix target calculation
 Fix library types to build
+Add extra options to gprinstall
 
---- sql/Makefile.orig	2022-09-02 15:43:38.000000000 +0300
-+++ sql/Makefile	2024-07-24 20:32:31.706525848 +0300
+--- sql/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
++++ sql/Makefile
+@@ -61,7 +61,7 @@
+ endif
+ 
+ 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
 @@ -85,7 +85,7 @@
  ifeq ($(ENABLE_SHARED), yes)
     LIBRARY_TYPES=static relocatable static-pic
@@ -13,3 +24,18 @@ Fix library types to build
  endif
  
  ifeq ($(INTEGRATED), yes)
+@@ -98,11 +98,13 @@
+ 
+ # Used to pass extra options to GPRBUILD, like -d for instance
+ GPRBUILD_OPTIONS=
++GPRINSTALL_OPTIONS=
+ 
+ BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
+ 	$(GPRBUILD_OPTIONS)
+ INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
+-	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
++	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
++	$(GPRINSTALL_OPTIONS)
+ CLEANER=gprclean -q $(RBD) $(GPR_VARS)
+ UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
+ 
diff --git a/gnatcoll-db/patches/patch-sqlite_Makefile b/gnatcoll-db/patches/patch-sqlite_Makefile
index 0c77bc8758..6a26eb977b 100644
--- a/gnatcoll-db/patches/patch-sqlite_Makefile
+++ b/gnatcoll-db/patches/patch-sqlite_Makefile
@@ -1,9 +1,20 @@
 $NetBSD: patch-sqlite_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
 
+Fix target calculation
 Fix library types to build
+Add extra options to gprinstall
 
---- sqlite/Makefile.orig	2022-09-02 15:43:38.000000000 +0300
-+++ sqlite/Makefile	2024-07-24 20:33:11.197470758 +0300
+--- sqlite/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
++++ sqlite/Makefile
+@@ -66,7 +66,7 @@
+ endif
+ 
+ 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
 @@ -92,7 +92,7 @@
  ifeq ($(ENABLE_SHARED), yes)
     LIBRARY_TYPES=static relocatable static-pic
@@ -13,3 +24,18 @@ Fix library types to build
  endif
  
  ifeq ($(INTEGRATED), yes)
+@@ -106,11 +106,13 @@
+ 
+ # Used to pass extra options to GPRBUILD, like -d for instance
+ GPRBUILD_OPTIONS=
++GPRINSTALL_OPTIONS=
+ 
+ BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
+ 	$(GPRBUILD_OPTIONS)
+ INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
+-	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
++	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
++	$(GPRINSTALL_OPTIONS)
+ CLEANER=gprclean -q $(RBD)
+ UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
+ 
diff --git a/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr b/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
index 0c181b99a5..48f3b986c1 100644
--- a/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
+++ b/gnatcoll-db/patches/patch-sqlite_gnatcoll__sqlite.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-sqlite_gnatcoll__sqlite.gpr,v 1.0 2024/07/24 19:00:00 dkazankov E
 Fix project paths
 
 --- sqlite/gnatcoll_sqlite.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ sqlite/gnatcoll_sqlite.gpr	2024-07-24 19:35:36.829916300 +0300
++++ sqlite/gnatcoll_sqlite.gpr
 @@ -23,7 +23,7 @@
  
  with "gnatcoll_sqlite_conf.gpr";
diff --git a/gnatcoll-db/patches/patch-version_information b/gnatcoll-db/patches/patch-version_information
deleted file mode 100644
index 96c7ab4a97..0000000000
--- a/gnatcoll-db/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
diff --git a/gnatcoll-db/patches/patch-xref_Makefile b/gnatcoll-db/patches/patch-xref_Makefile
index aa82466b2a..b6ac5745cd 100644
--- a/gnatcoll-db/patches/patch-xref_Makefile
+++ b/gnatcoll-db/patches/patch-xref_Makefile
@@ -1,9 +1,20 @@
 $NetBSD: patch-sql_Makefile,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
 
+Fix target calculation
 Fix library types to build
+Add extra options to gprinstall
 
---- xref/Makefile.orig	2022-09-02 15:43:38.000000000 +0300
-+++ xref/Makefile	2024-07-24 20:33:41.375207331 +0300
+--- xref/Makefile.orig	2023-11-06 12:21:17.000000000 +0200
++++ xref/Makefile
+@@ -76,7 +76,7 @@
+ # Load current setup if any
+ -include makefile.setup
+ 
+-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
 @@ -86,7 +86,7 @@
  ifeq ($(ENABLE_SHARED), yes)
     LIBRARY_TYPES=static relocatable static-pic
@@ -13,3 +24,18 @@ Fix library types to build
  endif
  
  ifeq ($(INTEGRATED), yes)
+@@ -99,11 +99,13 @@
+ 
+ # Used to pass extra options to GPRBUILD, like -d for instance
+ GPRBUILD_OPTIONS=
++GPRINSTALL_OPTIONS=
+ 
+ BUILDER=gprbuild -p -m $(GTARGET) $(RBD) -j$(PROCESSORS) $(GPR_VARS) \
+ 	$(GPRBUILD_OPTIONS)
+ INSTALLER=gprinstall -p -f --target=$(TARGET) $(GPR_VARS) \
+-	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install)
++	$(RBD) --sources-subdir=include/$(NAME) --prefix=$(prefix)$(integrated_install) \
++	$(GPRINSTALL_OPTIONS)
+ CLEANER=gprclean -q $(RBD) $(GPR_VARS)
+ UNINSTALLER=$(INSTALLER) -p -f --install-name=$(NAME) --uninstall
+ 
diff --git a/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr b/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr
index f0084d2e76..d1068e3878 100644
--- a/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr
+++ b/gnatcoll-db/patches/patch-xref_gnatcoll__xref.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-xref_gnatcoll__xref.gpr,v 1.0 2024/07/24 19:00:00 dkazankov Exp $
 Fix project paths
 
 --- xref/gnatcoll_xref.gpr.orig	2022-09-02 15:43:38.000000000 +0300
-+++ xref/gnatcoll_xref.gpr	2024-07-24 19:43:03.528885412 +0300
++++ xref/gnatcoll_xref.gpr
 @@ -24,8 +24,8 @@
  with "gnatcoll_xref_conf.gpr";
  with "gnatcoll";
Prev by Date: spark2014: change dependencies (unfinished)
Next by Date: gcc14-gnat: add latest gcc14 patches
Previous by Thread: spark2014: change dependencies (unfinished)
Next by Thread: gcc14-gnat: add latest gcc14 patches
Indexes:
Home | Main Index | Thread Index | Old Index