pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ada packages: test updated gcc13-gnat/gprbuild
Module Name: pkgsrc-wip
Committed By: Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By: dkazankov
Date: Wed Feb 12 19:41:13 2025 +0200
Changeset: 0fb638a7fae626adcbb8229b8c68078de50eb3af
Modified Files:
adasat/Makefile
gnatcoll-bindings/Makefile
gnatcoll-core/Makefile
gnatcoll-core/distinfo
gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
gnatcoll-db/Makefile
gnatcoll-db/distinfo
gnatcoll-db/options.mk
gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
gprlib/Makefile
gprlib/distinfo
gprlib/patches/patch-Makefile
gprlib/patches/patch-gpr_gpr.gpr
spark2014/Makefile
spark2014/distinfo
spark2014/patches/patch-Makefile
spark2014/patches/patch-gnatprove.gpr
spark2014/patches/patch-spark2014vsn.ads
spark2014/patches/patch-src_common_platform.ads
spark2014/patches/patch-src_common_semaphores__c.c
spark2014/patches/patch-src_common_x86__64-netbsd_platform.adb
spark2014/patches/patch-src_gnatprove_spark__report.adb
spark2014/patches/patch-why3_Makefile.in
xmlada/Makefile
Log Message:
ada packages: test updated gcc13-gnat/gprbuild
* adasat, xmlada, gprlib, gnatcoll-core, gnatcoll-bindings,
gnatcoll-db, spark2014: simplify Makefiles and some patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0fb638a7fae626adcbb8229b8c68078de50eb3af
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
adasat/Makefile | 9 ++--
gnatcoll-bindings/Makefile | 16 +++---
gnatcoll-core/Makefile | 11 ++--
gnatcoll-core/distinfo | 2 +-
.../patches/patch-core_gnatcoll__core.gpr | 15 ------
gnatcoll-db/Makefile | 17 +++----
gnatcoll-db/distinfo | 2 +-
gnatcoll-db/options.mk | 6 ++-
.../patches/patch-postgres_gnatcoll__postgres.gpr | 10 ----
gprlib/Makefile | 6 +--
gprlib/distinfo | 4 +-
gprlib/patches/patch-Makefile | 37 ++++++++------
gprlib/patches/patch-gpr_gpr.gpr | 19 +------
spark2014/Makefile | 58 +++++++++++-----------
spark2014/distinfo | 16 +++---
spark2014/patches/patch-Makefile | 4 +-
spark2014/patches/patch-gnatprove.gpr | 18 ++-----
spark2014/patches/patch-spark2014vsn.ads | 4 +-
spark2014/patches/patch-src_common_platform.ads | 2 +-
spark2014/patches/patch-src_common_semaphores__c.c | 2 +-
.../patch-src_common_x86__64-netbsd_platform.adb | 4 +-
.../patches/patch-src_gnatprove_spark__report.adb | 2 +-
spark2014/patches/patch-why3_Makefile.in | 2 +-
xmlada/Makefile | 6 +--
24 files changed, 113 insertions(+), 159 deletions(-)
diffs:
diff --git a/adasat/Makefile b/adasat/Makefile
index c6af434c4e..761073f0a8 100644
--- a/adasat/Makefile
+++ b/adasat/Makefile
@@ -14,10 +14,6 @@ LICENSE= apache-2.0
USE_TOOLS+= gmake
-CHECK_RELRO_SUPPORTED= no
-
-.include "../../mk/bsd.prefs.mk"
-
USE_LANGUAGES= ada
GCC_REQD+= 13
@@ -31,7 +27,10 @@ GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
+.include "../../mk/bsd.prefs.mk"
+
+
.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../devel/gprbuild/buildlink3.mk"
+.include "../../wip/gprbuild/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnatcoll-bindings/Makefile b/gnatcoll-bindings/Makefile
index 05a5d708fc..657c0dbbe7 100644
--- a/gnatcoll-bindings/Makefile
+++ b/gnatcoll-bindings/Makefile
@@ -13,8 +13,6 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake grep
-.include "../../mk/bsd.prefs.mk"
-
USE_LANGUAGES= c cpp ada
GCC_REQD+= 13
@@ -25,20 +23,20 @@ SUBST_FILES.fixver= version_information
SUBST_SED.fixver= -e 's,0.0,25.0,g'
SUBST_MESSAGE.fixver= Fix version information
+GENERATE_PLIST+= \
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
+
+.include "../../mk/bsd.prefs.mk"
+
.include "options.mk"
MAKE_FLAGS+= BINDINGS=${BINDINGS:Q}
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 "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../devel/gprbuild/buildlink3.mk"
-
-GPRBUILD_OPTIONS+= --config=../default.cgpr
-GPRINSTALL_OPTIONS+= --config=../default.cgpr
+.include "../../wip/gprbuild/buildlink3.mk"
BUILDLINK_DEPMETHOD.xmlada= full
.include "../../wip/xmlada/buildlink3.mk"
diff --git a/gnatcoll-core/Makefile b/gnatcoll-core/Makefile
index c5d3bc53b1..7c9eebaa62 100644
--- a/gnatcoll-core/Makefile
+++ b/gnatcoll-core/Makefile
@@ -13,8 +13,6 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake grep
-.include "../../mk/bsd.prefs.mk"
-
USE_LANGUAGES= c ada
GCC_REQD+= 13
@@ -25,13 +23,10 @@ GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
-.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../devel/gprbuild/buildlink3.mk"
+.include "../../mk/bsd.prefs.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}
+.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
+.include "../../wip/gprbuild/buildlink3.mk"
BUILDLINK_DEPMETHOD.xmlada= full
.include "../../wip/xmlada/buildlink3.mk"
diff --git a/gnatcoll-core/distinfo b/gnatcoll-core/distinfo
index 5c2e70a540..78d7815d79 100644
--- a/gnatcoll-core/distinfo
+++ b/gnatcoll-core/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (gnatcoll-core-25.0.0.tar.gz) = 4e3053b10a27ea4bd4fc1c8ba2e8ab936087507f
SHA512 (gnatcoll-core-25.0.0.tar.gz) = efa19b9760bd16b402445d4932dfd28f087f9a09b91ec688c6976b7b83fe5986580b1871378ac024e9a712df8ee75963e5dc88629a72ee1ce76f1d1403b8e122
Size (gnatcoll-core-25.0.0.tar.gz) = 7492612 bytes
SHA1 (patch-Makefile) = 5a6a41fadcd84fa0eda5122263fbb3dee601b546
-SHA1 (patch-core_gnatcoll__core.gpr) = f1d8d2ff72e78d9874cbf6a2ec41e3a0e46b30a8
+SHA1 (patch-core_gnatcoll__core.gpr) = 56e00307e6e0d87fa84f2a43e461c6b607e39810
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
diff --git a/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr b/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
index 5a23b6c8c8..95278d10f6 100644
--- a/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
+++ b/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
@@ -1,7 +1,6 @@
$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
--- core/gnatcoll_core.gpr.orig 2024-09-24 12:28:32.000000000 +0300
+++ core/gnatcoll_core.gpr
@@ -14,17 +13,3 @@ Fix RELRO options on NetBSD
when others =>
null;
end case;
-@@ -206,6 +206,13 @@
-
- for Switches ("gnatcoll_support.c") use
- Extra_Switches & Compiler'Switches ("C");
-+ case Library_Type is
-+ when "static-pic" | "relocatable" =>
-+ for PIC_Option ("Ada") use ("-fPIC");
-+ for PIC_Option ("C") use ("-fPIC");
-+ when others =>
-+ null;
-+ end case;
- end Compiler;
-
- package Binder is
diff --git a/gnatcoll-db/Makefile b/gnatcoll-db/Makefile
index 7fb8c457ab..d9a48ece44 100644
--- a/gnatcoll-db/Makefile
+++ b/gnatcoll-db/Makefile
@@ -17,8 +17,6 @@ HAS_CONFIGURE= yes
CHECK_PIE_SKIP+= bin/*
-.include "../../mk/bsd.prefs.mk"
-
USE_LANGUAGES= c ada
GCC_REQD+= 13
@@ -29,6 +27,12 @@ SUBST_FILES.fixver= version_information
SUBST_SED.fixver= -e 's,0.0,25.0,g'
SUBST_MESSAGE.fixver= Fix version information
+GENERATE_PLIST+= \
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} bin include lib share \( -type f -or -type l \) -print | ${SORT};
+
+.include "../../mk/bsd.prefs.mk"
+
.include "options.mk"
CONFIG_SHELL_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD
@@ -125,15 +129,8 @@ do-install:
. endif
.endfor
-GENERATE_PLIST+= \
- cd ${DESTDIR}${PREFIX} && \
- ${FIND} bin include lib share \( -type f -or -type l \) -print | ${SORT};
-
.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../devel/gprbuild/buildlink3.mk"
-
-GPRBUILD_OPTIONS+= --config=../default.cgpr
-GPRINSTALL_OPTIONS+= --config=../default.cgpr
+.include "../../wip/gprbuild/buildlink3.mk"
BUILDLINK_DEPMETHOD.xmlada= full
.include "../../wip/xmlada/buildlink3.mk"
diff --git a/gnatcoll-db/distinfo b/gnatcoll-db/distinfo
index befa029692..2061f8d0d1 100644
--- a/gnatcoll-db/distinfo
+++ b/gnatcoll-db/distinfo
@@ -11,7 +11,7 @@ SHA1 (patch-gnatcoll__db2ada_gnatcoll__sqlite2ada.gpr) = fb3b09094980a73dc010a5e
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-postgres_gnatcoll__postgres.gpr) = 159b99904d4346ce019085f72c731aeadbc4fced
SHA1 (patch-sql_Makefile) = 28d5eb0f5477afd97781d7256b2505cce5cb313a
SHA1 (patch-sqlite_Makefile) = f914c22128c5c349b9bec0df544dca66c357c65e
SHA1 (patch-sqlite_gnatcoll__sqlite.gpr) = 5e6d0831c12ee6e3ee68206da38c2f85dce86a81
diff --git a/gnatcoll-db/options.mk b/gnatcoll-db/options.mk
index 9854267a8e..74db2047bb 100644
--- a/gnatcoll-db/options.mk
+++ b/gnatcoll-db/options.mk
@@ -31,7 +31,6 @@ INSTALL_DIRS+= sqlite
.if !empty(PKG_OPTIONS:Mpostgres)
. include "../../wip/gnatcoll-bindings/buildlink3.mk"
-. include "../../mk/pgsql.buildlink3.mk"
CONFIGURE_DIRS+= postgres
BUILD_DIRS+= postgres
INSTALL_DIRS+= postgres
@@ -57,3 +56,8 @@ CONFIGURE_DIRS+= gnatcoll_db2ada
BUILD_DIRS+= gnatcoll_db2ada
INSTALL_DIRS+= gnatcoll_db2ada
.endif
+
+.if !empty(PKG_OPTIONS:Mpostgres) || \
+ !empty(PKG_OPTIONS:Mgnatcoll_postgres2ada) || !empty(PKG_OPTIONS:Mgnatcoll_all2ada)
+. include "../../mk/pgsql.buildlink3.mk"
+.endif
diff --git a/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr b/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
index 14c31d92eb..019e74a60d 100644
--- a/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
+++ b/gnatcoll-db/patches/patch-postgres_gnatcoll__postgres.gpr
@@ -1,7 +1,6 @@
$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 2023-11-06 12:21:17.000000000 +0200
+++ postgres/gnatcoll_postgres.gpr
@@ -14,12 +13,3 @@ Add required libraries
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/gprlib/Makefile b/gprlib/Makefile
index aa17297206..f9d04f1b4b 100644
--- a/gprlib/Makefile
+++ b/gprlib/Makefile
@@ -14,8 +14,6 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake
HAS_CONFIGURE= yes
-.include "../../mk/bsd.prefs.mk"
-
USE_LANGUAGES= c ada
GCC_REQD+= 13
@@ -32,8 +30,10 @@ GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
+.include "../../mk/bsd.prefs.mk"
+
.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../devel/gprbuild/buildlink3.mk"
+.include "../../wip/gprbuild/buildlink3.mk"
BUILDLINK_DEPMETHOD.xmlada= full
.include "../../wip/xmlada/buildlink3.mk"
diff --git a/gprlib/distinfo b/gprlib/distinfo
index 6b1d75720b..88802a8179 100644
--- a/gprlib/distinfo
+++ b/gprlib/distinfo
@@ -3,8 +3,8 @@ $NetBSD: distinfo,v 1.2 2024/03/19 13:20:35 wiz Exp $
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-gpr_gpr.gpr) = afabf62f6de4645d4b3c74b5326f5ab9be7ff26a
+SHA1 (patch-Makefile) = 62aaca338e57df5c6ae5f008df078b991e9ebfdd
+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) = 40deea3a0eb6cf6a3fda3ed8ed898d4daabe0423
SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
diff --git a/gprlib/patches/patch-Makefile b/gprlib/patches/patch-Makefile
index ab26c9f32d..51e144c6c6 100644
--- a/gprlib/patches/patch-Makefile
+++ b/gprlib/patches/patch-Makefile
@@ -1,28 +1,36 @@
-$NetBSD: patch-Makefile,v 1.2 2024/05/08 18:00:00 dkazankov Exp $
+$NetBSD: patch-Makefile,v 1.3 2025/02/08 14:14:49 wiz Exp $
-Make it possible to set install parameters, fix install parameters, ENABLE_SHARED
+Make it possible to set install parameters
+Fix install parameters
+Fix ENABLE_SHARED position
---- Makefile.orig 2023-10-09 21:31:11.000000000 +0300
-+++ Makefile 2024-05-08 22:24:58.865354615 +0300
-@@ -34,6 +34,9 @@
+--- Makefile.orig 2024-10-07 15:45:16.000000000 +0300
++++ Makefile
+@@ -34,9 +34,6 @@
SOURCE_DIR := $(shell dirname "$(MAKEFILE_LIST)")
LIB_DIR = lib/
-+ENABLE_SHARED := $(shell gprbuild $(GTARGET) -c -q -p \
-+ -P$(MAKEPREFIX)config/test_shared 2>/dev/null && echo "yes")
-+
- # Load current setup if any
- -include makefile.setup
-
-@@ -45,6 +48,7 @@
+-# Load current setup if any
+--include makefile.setup
+-
+ # target options for cross-build
+ ifeq ($(HOST),$(TARGET))
+ GTARGET=
+@@ -45,6 +42,13 @@
GTARGET=--target=$(TARGET)
endif
++ENABLE_SHARED := $(shell gprbuild $(GTARGET) -c -q -p \
++ -P$(MAKEPREFIX)config/test_shared 2>/dev/null && echo "yes")
++
++# Load current setup if any
++-include makefile.setup
++
+GPRINSTALL_OPTIONS=
INSTALLER=$(LIB_INSTALLER)
EXEC_INSTALLER=$(INSTALLER) -XBUILD=${BUILD}
-@@ -61,24 +65,21 @@
+@@ -61,32 +65,29 @@
MAKEPREFIX=$(SOURCE_DIR)/
endif
@@ -50,7 +58,8 @@ Make it possible to set install parameters, fix install parameters, ENABLE_SHARE
CLEANER=gprclean -q $(RBD)
GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
-@@ -86,7 +87,7 @@
+- -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
++ -XLIBRARY_TYPE=static-pic -XXMLADA_BUILD=static-pic
LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) $(LIBGPR_OS)
LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) $(LIBGPR_OS) -XBUILD=${BUILD} \
--install-name=gpr \
diff --git a/gprlib/patches/patch-gpr_gpr.gpr b/gprlib/patches/patch-gpr_gpr.gpr
index 50e223a745..0fc4508009 100644
--- a/gprlib/patches/patch-gpr_gpr.gpr
+++ b/gprlib/patches/patch-gpr_gpr.gpr
@@ -1,10 +1,9 @@
-$NetBSD: patch-gpr_gpr.gpr,v 1.3 2024/05/07 11:00:00 dkazankov Exp $
+$NetBSD: patch-gpr_gpr.gpr,v 1.4 2025/02/08 14:14:49 wiz Exp $
Fix name conflict with grpc - same as linux distros
-Fix RELRO
--- gpr/gpr.gpr.orig 2023-10-09 21:31:11.000000000 +0300
-+++ gpr/gpr.gpr 2024-05-15 09:39:04.188652027 +0300
++++ gpr/gpr.gpr 2024-05-07 16:34:34.759672549 +0300
@@ -38,7 +38,7 @@
for Source_Dirs use ("src");
@@ -14,17 +13,3 @@ Fix RELRO
for Object_Dir use "libobj/" & Bld & "/" & Gnat_Lib_Type;
for Library_Dir use "lib/" & Bld & "/" & Gnat_Lib_Type;
-@@ -73,6 +73,13 @@
- for Switches ("gpr*.ad?") use
- Compiler'Default_Switches ("Ada") & ("-g1");
- end case;
-+ case Gnat_Lib_Type is
-+ when "static" =>
-+ null;
-+ when "static-pic" | "relocatable" =>
-+ for PIC_Option("Ada") use ("-fPIC");
-+ for PIC_Option("C") use ("-fPIC");
-+ end case;
- end Compiler;
-
- ------------
diff --git a/spark2014/Makefile b/spark2014/Makefile
index 72a2c45a7d..52d0218484 100644
--- a/spark2014/Makefile
+++ b/spark2014/Makefile
@@ -15,8 +15,6 @@ HAS_CONFIGURE= yes
MKPIE_SUPPORTED= no
RELRO_SUPPORTED= no
-.include "../../mk/bsd.prefs.mk"
-
DISTNAME= spark2014-${PKGVERSION_NOREV}
GITHUB_PROJECT= spark2014
MASTER_SITES= ${MASTER_SITE_GITHUB:=AdaCore/}
@@ -39,32 +37,6 @@ SITES.${GCC_DISTFILE}= ${MASTER_SITE_GNU:=gcc/${GCC_DISTNAME}/}
GCC_REQD+= 13
-.include "../../devel/gprbuild/buildlink3.mk"
-
-.include "../../wip/xmlada/buildlink3.mk"
-.include "../../wip/gprlib/buildlink3.mk"
-.include "../../wip/gnatcoll-core/buildlink3.mk"
-
-PYTHON_VERSIONS_ACCEPTED= 312 311 310 39 38
-.include "../../lang/python/tool.mk"
-
-BUILDLINK_DEPMETHOD.ocaml= build
-.include "../../lang/ocaml/ocaml.mk"
-BUILDLINK_DEPMETHOD.ocamlgraph= build
-.include "../../devel/ocamlgraph/buildlink3.mk"
-BUILDLINK_DEPMETHOD.menhir= build
-.include "../../devel/menhir/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml-zarith= build
-.include "../../math/ocaml-zarith/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml-zip= build
-.include "../../archivers/ocaml-zip/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml-ocplib-simplex= build
-.include "../../wip/ocaml-ocplib-simplex/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml-num= build
-.include "../../math/ocaml-num/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml-yojson= build
-.include "../../devel/ocaml-yojson/buildlink3.mk"
-
CONFIG_SHELL= ${MAKE_PROGRAM}
CONFIGURE_ARGS+= DESTDIR=${DESTDIR} PREFIX=${PREFIX}
CONFIGURE_SCRIPT= setup
@@ -83,6 +55,8 @@ GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} bin \( -type f -or -type l \) -print | ${SORT};
+.include "../../mk/bsd.prefs.mk"
+
post-extract:
# Link GNAT sources to main build tree
${RUN} cd ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG} \
@@ -93,4 +67,32 @@ post-install:
cd ${DESTDIR}${PREFIX} && \
${CHMOD} -R -P g-w ./*
+.include "../../wip/gprbuild/buildlink3.mk"
+
+.include "../../wip/xmlada/buildlink3.mk"
+.include "../../wip/gprlib/buildlink3.mk"
+.include "../../wip/gnatcoll-core/buildlink3.mk"
+
+PYTHON_VERSIONS_ACCEPTED= 312 311 310 39 38
+.include "../../lang/python/tool.mk"
+
+BUILDLINK_DEPMETHOD.ocaml= build
+.include "../../lang/ocaml/ocaml.mk"
+BUILDLINK_DEPMETHOD.ocamlgraph= build
+.include "../../devel/ocamlgraph/buildlink3.mk"
+BUILDLINK_DEPMETHOD.menhir= build
+.include "../../devel/menhir/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-zarith= build
+.include "../../math/ocaml-zarith/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-zip= build
+.include "../../archivers/ocaml-zip/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-ocplib-simplex= build
+.include "../../wip/ocaml-ocplib-simplex/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-num= build
+.include "../../math/ocaml-num/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-yojson= build
+.include "../../devel/ocaml-yojson/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/spark2014/distinfo b/spark2014/distinfo
index 05f7848b6d..4e1f4ceaf0 100644
--- a/spark2014/distinfo
+++ b/spark2014/distinfo
@@ -18,11 +18,11 @@ Size (gcc-13.3.0.tar.xz) = 87909952 bytes
BLAKE2s (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 32b2081dfd7bbb4442bc791848cc4900a8cb9214e69fce6b55ef3724b2c9b145
SHA512 (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 17644c49e642b2e79cfe481414d12df5b27bad003cdabbb0c9e88f5eb1f8b705b159791612a2d5f720e67017f0867ffaa5cfa0bc5fae8188442cd15fb456890b
Size (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 11924977 bytes
-SHA1 (patch-Makefile) = 9157605f7a801b9a6efc91277610db77b5017b79
-SHA1 (patch-gnatprove.gpr) = 4fdad2117e0c5c68eb526fd9958ed3aad395ae9b
-SHA1 (patch-spark2014vsn.ads) = 602aa8c17a6cb67342ac09f3c88b7516b5af5ffb
-SHA1 (patch-src_common_platform.ads) = 4ff7b14c8811cecfa9fce51b813257c2e6a1efe1
-SHA1 (patch-src_common_semaphores__c.c) = ded64d4445bea8f05135ca179462cb5ed59ecfe9
-SHA1 (patch-src_common_x86__64-netbsd_platform.adb) = 44abca7d7c65a762e393cad9de0013d6949339e9
-SHA1 (patch-src_gnatprove_spark__report.adb) = ebea33ff633f24cee09188cbbded4b12deeaba1c
-SHA1 (patch-why3_Makefile.in) = 6172e55a5263ac19248916db57da4b7a387fdd7d
+SHA1 (patch-Makefile) = e27afdf221bd7d527ba2e2d1046d67690319481c
+SHA1 (patch-gnatprove.gpr) = 5d2bcbfacbbd3785e084e0142cd7b660ee069d35
+SHA1 (patch-spark2014vsn.ads) = ab6a841bf7398c2f3b8df312463cbbcc59a02808
+SHA1 (patch-src_common_platform.ads) = a81254a67a3a847e1d1de35b310d1b8d9a442c69
+SHA1 (patch-src_common_semaphores__c.c) = 70f91a26919bca7772c35cbf211b38ab5c4cadd3
+SHA1 (patch-src_common_x86__64-netbsd_platform.adb) = eda3cf7f68c989280f9e684e9a5d9188ef41e690
+SHA1 (patch-src_gnatprove_spark__report.adb) = ef2941bb82881ab1f718dfec72764871c672f965
+SHA1 (patch-why3_Makefile.in) = 5d8385d634f1d4385109ec11ce5c239df85b2f51
diff --git a/spark2014/patches/patch-Makefile b/spark2014/patches/patch-Makefile
index 8a1ca7f268..4ed29a86fe 100644
--- a/spark2014/patches/patch-Makefile
+++ b/spark2014/patches/patch-Makefile
@@ -3,7 +3,7 @@ $NetBSD: patch-Makefile,v 1.0 2024/05/13 10:30:00 dkazankov Exp $
Fix install directory, build type, version number and NetBSD sha256sum
--- Makefile.orig 2023-01-05 11:22:11.000000000 +0200
-+++ Makefile 2024-05-20 14:53:45.799587834 +0300
++++ Makefile
@@ -41,7 +41,9 @@
install-all why3 all setup all-nightly doc-nightly run-benchmark \
create-benchmark
@@ -23,7 +23,7 @@ Fix install directory, build type, version number and NetBSD sha256sum
CP=cp -pr
MV=mv -f
-VERSION=0.0w
-+VERSION=13.0
++VERSION='FSF 13.0'
# main target for developers
all: gnat2why gnatprove why3
diff --git a/spark2014/patches/patch-gnatprove.gpr b/spark2014/patches/patch-gnatprove.gpr
index d97f2ec49c..1610d4ef2e 100644
--- a/spark2014/patches/patch-gnatprove.gpr
+++ b/spark2014/patches/patch-gnatprove.gpr
@@ -1,27 +1,17 @@
$NetBSD: patch-gnatprove.gpr,v 1.0 2024/05/19 22:00:00 dkazankov Exp $
-Fix missing RELRO
Add librt link on NetBSD
--- gnatprove.gpr.orig 2023-01-05 11:22:11.000000000 +0200
-+++ gnatprove.gpr 2024-05-20 16:33:06.170314454 +0300
-@@ -51,6 +51,8 @@
- when "Production" =>
- for Default_Switches ("Ada") use
- Common_Switches & ("-O2", "-gnatn");
-+ for PIC_Option ("Ada") use ("-fPIC");
-+ for PIC_Option ("C") use ("-fPIC");
- when "Coverage" =>
- -- We don't do coverage of gnatprove yet, only gnat2why
- null;
++++ gnatprove.gpr
@@ -61,6 +63,10 @@
case Target is
when "x86-linux" | "x86_64-linux" =>
for Default_Switches ("Ada") use ("-pthread");
+ when "x86_64-netbsd" =>
-+ for Default_Switches ("Ada") use ("-lrt");
-+ for Default_Switches ("C") use ("-lrt");
-+ for Linker_Options use ("-lrt");
++ for Default_Switches ("Ada") use ("-lpthread");
++ for Default_Switches ("C") use ("-lpthread");
++ for Linker_Options use ("-lpthread");
when others =>
null;
end case;
diff --git a/spark2014/patches/patch-spark2014vsn.ads b/spark2014/patches/patch-spark2014vsn.ads
index caac4355ef..533f6a0726 100644
--- a/spark2014/patches/patch-spark2014vsn.ads
+++ b/spark2014/patches/patch-spark2014vsn.ads
@@ -3,13 +3,13 @@ $NetBSD: patch-spark2014vsn.ads,v 1.0 2024/05/19 22:00:00 dkazankov Exp $
Fix version number
--- spark2014vsn.ads.orig 2023-01-05 11:22:11.000000000 +0200
-+++ spark2014vsn.ads 2024-05-19 23:19:54.364201126 +0300
++++ spark2014vsn.ads
@@ -22,7 +22,7 @@
package SPARK2014VSN is
- SPARK2014_Static_Version_String : constant String := "0.0w";
-+ SPARK2014_Static_Version_String : constant String := "13.0";
++ SPARK2014_Static_Version_String : constant String := "FSF 13.0";
-- Static string identifying this version, that can be used as an argument
-- to e.g. pragma Ident.
--
diff --git a/spark2014/patches/patch-src_common_platform.ads b/spark2014/patches/patch-src_common_platform.ads
index 50e2a878cd..265ce31351 100644
--- a/spark2014/patches/patch-src_common_platform.ads
+++ b/spark2014/patches/patch-src_common_platform.ads
@@ -3,7 +3,7 @@ $NetBSD: patch-src_common_platform.ads,v 1.0 2024/05/19 22:00:00 dkazankov Exp $
Add NetBSD support
--- src/common/platform.ads.orig 2023-01-05 11:22:11.000000000 +0200
-+++ src/common/platform.ads 2024-05-19 22:23:47.685720387 +0300
++++ src/common/platform.ads
@@ -30,7 +30,7 @@
type Host_Operating_System_Flavor is
diff --git a/spark2014/patches/patch-src_common_semaphores__c.c b/spark2014/patches/patch-src_common_semaphores__c.c
index b7b0d518e2..4c2a15e0c0 100644
--- a/spark2014/patches/patch-src_common_semaphores__c.c
+++ b/spark2014/patches/patch-src_common_semaphores__c.c
@@ -3,7 +3,7 @@ $NetBSD: patch-src_common_semaphores__c.c,v 1.0 2024/05/31 14:00:00 dkazankov Ex
Fix runtime error caused semaphore names on NetBSD
--- src/common/semaphores_c.c.orig 2023-01-05 11:22:11.000000000 +0200
-+++ src/common/semaphores_c.c 2024-05-31 22:33:16.871296137 +0300
++++ src/common/semaphores_c.c
@@ -30,8 +30,33 @@
#include <stdio.h>
#include <stdlib.h>
diff --git a/spark2014/patches/patch-src_common_x86__64-netbsd_platform.adb b/spark2014/patches/patch-src_common_x86__64-netbsd_platform.adb
index cf339390b0..d3eb781e7e 100644
--- a/spark2014/patches/patch-src_common_x86__64-netbsd_platform.adb
+++ b/spark2014/patches/patch-src_common_x86__64-netbsd_platform.adb
@@ -2,8 +2,8 @@ $NetBSD: patch-src_common_x86__64-netbsd_platform.adb,v 1.0 2024/05/19 22:00:00
Add NetBSD support
---- /dev/null 2024-05-19 12:29:31.992878759 +0300
-+++ src/common/x86_64-netbsd/platform.adb 2024-05-19 22:09:54.259989387 +0300
+--- /dev/null
++++ src/common/x86_64-netbsd/platform.adb
@@ -0,0 +1,37 @@
+------------------------------------------------------------------------------
+-- --
diff --git a/spark2014/patches/patch-src_gnatprove_spark__report.adb b/spark2014/patches/patch-src_gnatprove_spark__report.adb
index fbe0e8fc0b..63805166a6 100644
--- a/spark2014/patches/patch-src_gnatprove_spark__report.adb
+++ b/spark2014/patches/patch-src_gnatprove_spark__report.adb
@@ -3,7 +3,7 @@ $NetBSD: patch-src_gnatprove_spark__report.adb,v 1.0 2024/05/19 22:00:00 dkazank
Add NetBSD support
--- src/gnatprove/spark_report.adb.orig 2023-01-05 11:22:11.000000000 +0200
-+++ src/gnatprove/spark_report.adb 2024-05-19 22:18:24.026147372 +0300
++++ src/gnatprove/spark_report.adb
@@ -1086,6 +1086,7 @@
when X86_Linux | X86_64_Linux => "Linux",
when X86_64_Darwin => "Darwin",
diff --git a/spark2014/patches/patch-why3_Makefile.in b/spark2014/patches/patch-why3_Makefile.in
index b39c0bb1fa..2913f72ba1 100644
--- a/spark2014/patches/patch-why3_Makefile.in
+++ b/spark2014/patches/patch-why3_Makefile.in
@@ -3,7 +3,7 @@ $NetBSD: patch-why3_Makefile.in,v 1.0 2024/05/20 09:00:00 dkazankov Exp $
NetBSD doesn't have -C option
--- why3/Makefile.in.orig 2022-12-21 10:10:00.000000000 +0200
-+++ why3/Makefile.in 2024-05-20 13:01:28.447738691 +0300
++++ why3/Makefile.in
@@ -844,7 +844,7 @@
$(INSTALL_DATA) share/images/*.png $(DATADIR)/why3/images
$(MKDIR_P) $(DATADIR)/why3/lang
diff --git a/xmlada/Makefile b/xmlada/Makefile
index a4e7666048..b356d25e9c 100644
--- a/xmlada/Makefile
+++ b/xmlada/Makefile
@@ -15,8 +15,6 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-.include "../../mk/bsd.prefs.mk"
-
USE_LANGUAGES= ada
GCC_REQD+= 13
@@ -33,7 +31,9 @@ GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
+.include "../../mk/bsd.prefs.mk"
+
.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../devel/gprbuild/buildlink3.mk"
+.include "../../wip/gprbuild/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index