pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ada library packages: refactor shared libraries support
Module Name: pkgsrc-wip
Committed By: Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By: dkazankov
Date: Fri May 23 23:37:40 2025 +0300
Changeset: 173e7aedbfa88f404fc0551fca042d467049231a
Modified Files:
adasat/Makefile
adasat/buildlink3.mk
gnatcoll-bindings/Makefile
gnatcoll-bindings/buildlink3.mk
gnatcoll-bindings/options.mk
gnatcoll-core/Makefile
gnatcoll-core/buildlink3.mk
gnatcoll-db/Makefile
gnatcoll-db/buildlink3.mk
gnatcoll-db/options.mk
gprlib/Makefile
gprlib/buildlink3.mk
polyorb/Makefile
polyorb/options.mk
xmlada/Makefile
xmlada/buildlink3.mk
Removed Files:
adasat/options.mk
gnatcoll-core/options.mk
gprlib/options.mk
xmlada/options.mk
Log Message:
ada library packages: refactor shared libraries support
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=173e7aedbfa88f404fc0551fca042d467049231a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
adasat/Makefile | 11 +++++++++--
adasat/buildlink3.mk | 2 +-
adasat/options.mk | 19 -------------------
gnatcoll-bindings/Makefile | 20 +++++++++++++++++---
gnatcoll-bindings/buildlink3.mk | 2 +-
gnatcoll-bindings/options.mk | 19 -------------------
gnatcoll-core/Makefile | 25 ++++++++++++++++++-------
gnatcoll-core/buildlink3.mk | 2 +-
gnatcoll-core/options.mk | 23 -----------------------
gnatcoll-db/Makefile | 24 +++++++++++++++++++-----
gnatcoll-db/buildlink3.mk | 2 +-
gnatcoll-db/options.mk | 19 -------------------
gprlib/Makefile | 18 +++++++++++++-----
gprlib/buildlink3.mk | 2 +-
gprlib/options.mk | 21 ---------------------
polyorb/Makefile | 16 ++++++++++++++++
polyorb/options.mk | 35 ++++++-----------------------------
xmlada/Makefile | 14 ++++++++++++--
xmlada/buildlink3.mk | 2 +-
xmlada/options.mk | 19 -------------------
20 files changed, 116 insertions(+), 179 deletions(-)
diffs:
diff --git a/adasat/Makefile b/adasat/Makefile
index 49083c3314..87df625615 100644
--- a/adasat/Makefile
+++ b/adasat/Makefile
@@ -18,10 +18,17 @@ USE_LANGUAGES= ada
# See xmlada package for rationale
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-ALL_LIBRARY_TYPES?= static static-pic relocatable
+USE_PKGSRC_GCC_RUNTIME?= no
+
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+ALL_LIBRARY_TYPES= static static-pic relocatable
+.else
+ALL_LIBRARY_TYPES= static static-pic
+.endif
MAKE_FLAGS+= BUILD_MODE=prod
MAKE_FLAGS+= ALL_LIBRARY_TYPES=${ALL_LIBRARY_TYPES:Q}
diff --git a/adasat/buildlink3.mk b/adasat/buildlink3.mk
index 8367247b53..c7f953a0ea 100644
--- a/adasat/buildlink3.mk
+++ b/adasat/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.adasat?= ../../wip/adasat
BUILDLINK_DEPMETHOD.adasat?= build
BUILDLINK_CONTENTS_FILTER.adasat= \
- ${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$)'
+ ${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$)'
pkgbase := adasat
.include "../../mk/pkg-build-options.mk"
diff --git a/adasat/options.mk b/adasat/options.mk
deleted file mode 100644
index 2d1f1b6f4f..0000000000
--- a/adasat/options.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2025/05/09 16:00:00 dkazankov Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.adasat
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-ALL_LIBRARY_TYPES= static static-pic relocatable
-USE_GCC_RUNTIME= yes
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-ALL_LIBRARY_TYPES= static static-pic
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-USE_GCC_RUNTIME= yes
-.endif
diff --git a/gnatcoll-bindings/Makefile b/gnatcoll-bindings/Makefile
index 6cc95a2c9b..f91d33aa4c 100644
--- a/gnatcoll-bindings/Makefile
+++ b/gnatcoll-bindings/Makefile
@@ -17,7 +17,12 @@ USE_LANGUAGES= c c++ ada
# See xmlada package for rationale
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
+
+USE_PKGSRC_GCC_RUNTIME?= no
+
.include "options.mk"
SUBST_CLASSES+= fixver
@@ -26,13 +31,22 @@ SUBST_FILES.fixver= version_information
SUBST_SED.fixver= -e 's,0.0,25.0,g'
SUBST_MESSAGE.fixver= Fix version information
+MAKE_FLAGS+= BINDINGS=${BINDINGS:Q}
+MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD
+
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+MAKE_FLAGS+= ENABLE_SHARED=yes
+BUILDLINK_DEPMETHOD.xmlada= full
+BUILDLINK_DEPMETHOD.gprlib= full
+BUILDLINK_DEPMETHOD.gnatcoll-core= full
+.else
+MAKE_FLAGS+= ENABLE_SHARED=no
+.endif
+
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
-MAKE_FLAGS+= BINDINGS=${BINDINGS:Q}
-MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD
-
.include "../../devel/gprbuild/buildlink3.mk"
.include "../../wip/xmlada/buildlink3.mk"
.include "../../wip/gprlib/buildlink3.mk"
diff --git a/gnatcoll-bindings/buildlink3.mk b/gnatcoll-bindings/buildlink3.mk
index 0155ea9be3..edc3e2dfeb 100644
--- a/gnatcoll-bindings/buildlink3.mk
+++ b/gnatcoll-bindings/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gnatcoll-bindings?= ../../wip/gnatcoll-bindings
BUILDLINK_DEPMETHOD.gnatcoll-bindings?= build
BUILDLINK_CONTENTS_FILTER.gnatcoll-bindings= \
- ${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr)'
+ ${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr)'
pkgbase := gnatcoll-bindings
.include "../../mk/pkg-build-options.mk"
diff --git a/gnatcoll-bindings/options.mk b/gnatcoll-bindings/options.mk
index 566ba9b8d0..845ee29b6a 100644
--- a/gnatcoll-bindings/options.mk
+++ b/gnatcoll-bindings/options.mk
@@ -3,31 +3,12 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.gnatcoll-bindings
PKG_SUPPORTED_OPTIONS= gnatcoll-cpp gnatcoll-gmp gnatcoll-iconv gnatcoll-lzma gnatcoll-omp \
gnatcoll-python gnatcoll-python3 gnatcoll-readline gnatcoll-syslog gnatcoll-zlib
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
PKG_SUGGESTED_OPTIONS= gnatcoll-cpp gnatcoll-gmp gnatcoll-iconv gnatcoll-lzma gnatcoll-omp \
gnatcoll-python3 gnatcoll-readline gnatcoll-syslog gnatcoll-zlib
.include "../../mk/bsd.fast.prefs.mk"
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-MAKE_FLAGS+= ENABLE_SHARED=yes
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-BUILDLINK_DEPMETHOD.gnatcoll-core= full
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-MAKE_FLAGS+= ENABLE_SHARED=no
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-BUILDLINK_DEPMETHOD.gnatcoll-core= full
-.endif
-
.if !empty(PKG_OPTIONS:Mgnatcoll-cpp)
BINDINGS+= cpp
.endif
diff --git a/gnatcoll-core/Makefile b/gnatcoll-core/Makefile
index 4ec7bf5929..4b4455eaf9 100644
--- a/gnatcoll-core/Makefile
+++ b/gnatcoll-core/Makefile
@@ -18,18 +18,19 @@ USE_LANGUAGES= c ada
# See xmlada package for rationale
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD
+USE_PKGSRC_GCC_RUNTIME?= no
# Use C preprocessed symbols on NetBSD
.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+= _ldl
-SUBST_MESSAGE._ldl= Fix extra libs on NetBSD in ${SUBST_FILES._ldl}
-SUBST_STAGE._ldl= pre-configure
-SUBST_FILES._ldl= core/gnatcoll_core.gpr
-SUBST_SED._ldl= -e "s,\"-ldl\",\"\","
+SUBST_CLASSES+= ldl
+SUBST_MESSAGE.ldl= Fix extra libs on NetBSD in ${SUBST_FILES.ldl}
+SUBST_STAGE.ldl= pre-configure
+SUBST_FILES.ldl= core/gnatcoll_core.gpr
+SUBST_SED.ldl= -e "s,\"-ldl\",\"\","
SUBST_CLASSES+= opendir
SUBST_MESSAGE.opendir= Replace opendir with __gnatcoll_opendir in ${SUBST_FILES.opendir}
@@ -38,6 +39,16 @@ SUBST_FILES.opendir= core/src/os/unix/gnatcoll-os-libc-dirent.ads
SUBST_SED.opendir= -e "s,\"opendir\",\"__gnatcoll_opendir\","
.endif
+MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD
+
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+MAKE_FLAGS+= ENABLE_SHARED=yes
+BUILDLINK_DEPMETHOD.xmlada= full
+BUILDLINK_DEPMETHOD.gprlib= full
+.else
+MAKE_FLAGS+= ENABLE_SHARED=no
+.endif
+
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
diff --git a/gnatcoll-core/buildlink3.mk b/gnatcoll-core/buildlink3.mk
index d622230786..c9a6b71e64 100644
--- a/gnatcoll-core/buildlink3.mk
+++ b/gnatcoll-core/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gnatcoll-core?= ../../wip/gnatcoll-core
BUILDLINK_DEPMETHOD.gnatcoll-core?= build
BUILDLINK_CONTENTS_FILTER.gnatcoll-core= \
- ${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*$$|share/gpr/manifests/gnatcoll.*|share/gpr/gnatcoll.*\.gpr$$)'
+ ${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*$$|share/gpr/manifests/gnatcoll.*|share/gpr/gnatcoll.*\.gpr$$)'
pkgbase := gnatcoll-core
.include "../../mk/pkg-build-options.mk"
diff --git a/gnatcoll-core/options.mk b/gnatcoll-core/options.mk
deleted file mode 100644
index 6448f34332..0000000000
--- a/gnatcoll-core/options.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2025/05/09 16:00:00 dkazankov Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gnatcoll-core
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-MAKE_FLAGS+= ENABLE_SHARED=yes
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-MAKE_FLAGS+= ENABLE_SHARED=no
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-.endif
diff --git a/gnatcoll-db/Makefile b/gnatcoll-db/Makefile
index b5585c1bf5..4127a5e672 100644
--- a/gnatcoll-db/Makefile
+++ b/gnatcoll-db/Makefile
@@ -20,7 +20,12 @@ USE_LANGUAGES= c ada
# See xmlada package for rationale
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
+
+USE_PKGSRC_GCC_RUNTIME?= no
+
.include "options.mk"
SUBST_CLASSES+= fixver
@@ -29,20 +34,29 @@ 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};
-
CONFIGURE_ARGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD BUILD_DIRS=${PKG_BUILD_DIRS:Q} \
- DB_BACKENDS=${DB_BACKENDS:Q}
+ DB_BACKENDS=${DB_BACKENDS:Q}
MAKE_FLAGS+= BUILD_DIRS=${PKG_BUILD_DIRS:Q} DB_BACKENDS=${DB_BACKENDS:Q}
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+CONFIGURE_ARGS+= ENABLE_SHARED=yes
+BUILDLINK_DEPMETHOD.xmlada= full
+BUILDLINK_DEPMETHOD.gprlib= full
+BUILDLINK_DEPMETHOD.gnatcoll-core= full
+.else
+CONFIGURE_ARGS+= ENABLE_SHARED=no
+.endif
+
do-configure:
${RUN}${_ULIMIT_CMD} \
cd ${WRKSRC} && \
${PKGSRC_SETENV} ${CONFIGURE_ENV} \
${MAKE_PROGRAM} ${CONFIGURE_ARGS} setup
+GENERATE_PLIST+= \
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} bin include lib share \( -type f -or -type l \) -print | ${SORT};
+
.include "../../devel/gprbuild/buildlink3.mk"
.include "../../wip/xmlada/buildlink3.mk"
.include "../../wip/gprlib/buildlink3.mk"
diff --git a/gnatcoll-db/buildlink3.mk b/gnatcoll-db/buildlink3.mk
index b27b300158..601150ec7d 100644
--- a/gnatcoll-db/buildlink3.mk
+++ b/gnatcoll-db/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gnatcoll-db?= ../../wip/gnatcoll-db
BUILDLINK_DEPMETHOD.gnatcoll-db?= build
BUILDLINK_CONTENTS_FILTER.gnatcoll-db= \
- ${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$|bin/gnatcoll_.*2ada$$|bin/gnatinspect$$)'
+ ${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$|bin/gnatcoll_.*2ada$$|bin/gnatinspect$$)'
pkgbase := gnatcoll-db
.include "../../mk/pkg-build-options.mk"
diff --git a/gnatcoll-db/options.mk b/gnatcoll-db/options.mk
index 468cea111f..bac87aeaaa 100644
--- a/gnatcoll-db/options.mk
+++ b/gnatcoll-db/options.mk
@@ -3,31 +3,12 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.gnatcoll-db
PKG_SUPPORTED_OPTIONS= gnatcoll-db2ada gnatcoll-postgres2ada gnatcoll-sqlite2ada gnatcoll-all2ada \
gnatcoll-gnatinspect gnatcoll-postgres gnatcoll-sql gnatcoll-sqlite gnatcoll-xref
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
PKG_SUGGESTED_OPTIONS= gnatcoll-db2ada gnatcoll-postgres2ada gnatcoll-sqlite2ada gnatcoll-all2ada \
gnatcoll-gnatinspect gnatcoll-postgres gnatcoll-sql gnatcoll-sqlite gnatcoll-xref
.include "../../mk/bsd.fast.prefs.mk"
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-CONFIGURE_FLAGS+= ENABLE_SHARED=yes
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-BUILDLINK_DEPMETHOD.gnatcoll-core= full
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-CONFIGURE_FLAGS+= ENABLE_SHARED=no
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-BUILDLINK_DEPMETHOD.gnatcoll-core= full
-.endif
-
# Build order is important
.if !empty(PKG_OPTIONS:Mgnatcoll-sql)
PKG_BUILD_DIRS+= sql
diff --git a/gprlib/Makefile b/gprlib/Makefile
index e5a8d7518a..ccc88f4b49 100644
--- a/gprlib/Makefile
+++ b/gprlib/Makefile
@@ -16,13 +16,14 @@ USE_TOOLS+= gmake
HAS_CONFIGURE= yes
USE_LANGUAGES= c ada
-
# GPRLIB 25 uses -gnat2020 switch
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
+USE_PKGSRC_GCC_RUNTIME?= no
# Use C preprocessed symbols on NetBSD
.if ${OPSYS} == "NetBSD"
@@ -33,7 +34,14 @@ SUBST_FILES.getrusage= gpr/src/gpr-util-put_resource_usage__unix.adb
SUBST_SED.getrusage= -e "s,\"getrusage\",\"__netbsd_getrusage\","
.endif
-CONFIGURE_ARGS+= prefix=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+= prefix=${DESTDIR}${PREFIX}
+
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+CONFIGURE_ARGS+= ENABLE_SHARED=yes
+BUILDLINK_DEPMETHOD.xmlada= full
+.else
+CONFIGURE_ARGS+= ENABLE_SHARED=no
+.endif
do-configure:
${RUN}${_ULIMIT_CMD} \
@@ -41,8 +49,8 @@ do-configure:
${PKGSRC_SETENV} ${CONFIGURE_ENV} \
${MAKE_PROGRAM} ${CONFIGURE_ARGS} setup
-BUILD_TARGET= libgpr.build
-INSTALL_TARGET= libgpr.install
+BUILD_TARGET= libgpr.build
+INSTALL_TARGET= libgpr.install
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
diff --git a/gprlib/buildlink3.mk b/gprlib/buildlink3.mk
index 8257c9e08c..d4ad251b7d 100644
--- a/gprlib/buildlink3.mk
+++ b/gprlib/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gprlib?= ../../wip/gprlib
BUILDLINK_DEPMETHOD.gprlib?= build
BUILDLINK_CONTENTS_FILTER.gprlib= \
- ${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatprj.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$|/gpr\.adb$$|/gpr-util-put_resource_usage__unix\.adb$$)'
+ ${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatprj.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$|/gpr\.adb$$|/gpr-util-put_resource_usage__unix\.adb$$)'
pkgbase := gprlib
.include "../../mk/pkg-build-options.mk"
diff --git a/gprlib/options.mk b/gprlib/options.mk
deleted file mode 100644
index d9b9f21a00..0000000000
--- a/gprlib/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2025/05/09 16:00:00 dkazankov Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gprlib
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-CONFIGURE_ARGS+= ENABLE_SHARED=yes
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-CONFIGURE_ARGS+= ENABLE_SHARED=no
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-.endif
diff --git a/polyorb/Makefile b/polyorb/Makefile
index ed3733111a..47c9a1518b 100644
--- a/polyorb/Makefile
+++ b/polyorb/Makefile
@@ -19,10 +19,16 @@ GNU_CONFIGURE= yes
CHECK_PIE_SKIP+= bin/*
USE_LANGUAGES= c ada
+
# See xmlada package for rationale
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
+
+USE_PKGSRC_GCC_RUNTIME?= no
+
.include "options.mk"
OVERRIDE_RELEASE_PLACEHOLDER= 25.0w
@@ -41,6 +47,16 @@ CONFIGURE_ARGS+= --with-corba-services=${CORBA_SERVICES:Q}
EXTRA_GNATMAKE_FLAGS+= -eL -R -largs $${LDFLAGS} -margs
CONFIGURE_ENV+= EXTRA_GNATMAKE_FLAGS=${EXTRA_GNATMAKE_FLAGS:Q}
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --with-gprbuild=gprbuild
+BUILDLINK_DEPMETHOD.xmlada= full
+BUILDLINK_DEPMETHOD.gprlib= full
+BUILDLINK_DEPMETHOD.gnatcoll-core= full
+.else
+CONFIGURE_ARGS+= --disable-shared
+.endif
+
INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
GENERATE_PLIST+= \
diff --git a/polyorb/options.mk b/polyorb/options.mk
index fe091ae2e6..174f40c7d6 100644
--- a/polyorb/options.mk
+++ b/polyorb/options.mk
@@ -4,39 +4,16 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.polyorb
PKG_SUPPORTED_OPTIONS= ap-corba ap-dsa ap-moma ap-aws \
pp-giop pp-soap pp-srp pp-dns \
cs-event cs-ir cs-naming cs-notification cs-time \
- gnatcoll
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs openssl
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
-PKG_OPTIONS_GROUP.openssl= openssl builtin-openssl
+ gnatcoll openssl builtin-openssl
+PKG_OPTIONS_GROUP.opensslg= openssl builtin-openssl
+PKG_SUGGESTED_OPTIONS= ap-corba ap-dsa ap-moma \
+ pp-giop pp-soap pp-srp pp-dns \
+ cs-event cs-ir cs-naming cs-notification cs-time \
+ builtin-openssl gnatcoll
.include "../../mk/bsd.fast.prefs.mk"
-
-PKG_SUGGESTED_OPTIONS= ap-corba ap-dsa ap-moma \
- pp-giop pp-soap pp-srp pp-dns \
- cs-event cs-ir cs-naming cs-notification cs-time \
- builtin-openssl gnatcoll
-
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --with-gprbuild=gprbuild
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-BUILDLINK_DEPMETHOD.gnatcoll-core= full
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-CONFIGURE_ARGS+= --disable-shared
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-CONFIGURE_ARGS+= --with-gprbuild=gprbuild
-USE_GCC_RUNTIME= yes
-BUILDLINK_DEPMETHOD.xmlada= full
-BUILDLINK_DEPMETHOD.gprlib= full
-BUILDLINK_DEPMETHOD.gnatcoll-core= full
-.endif
-
.if !empty(PKG_OPTIONS:Mbuiltin-openssl)
USE_BUILTIN.openssl= yes
.include "../../security/openssl/buildlink3.mk"
diff --git a/xmlada/Makefile b/xmlada/Makefile
index c72d2e1ee3..cadbbfbc3c 100644
--- a/xmlada/Makefile
+++ b/xmlada/Makefile
@@ -16,13 +16,17 @@ USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LANGUAGES= ada
+
# Xmlada 25 can still be built by GNAT 6, but other Adacore's 25 series libs can not.
-# So for uniformity and compatibility we use minimum version which can build all libs.
+# So for uniformity and compatibility we set minimum version which can build all libs.
+# Anyway usage of gcc6-aux with gprbuild requires modification of gcc6-aux package.
GCC_REQD+= 13
+USE_GCC_RUNTIME= yes
+
.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
+USE_PKGSRC_GCC_RUNTIME?= no
SUBST_CLASSES+= fixver
SUBST_STAGE.fixver= pre-configure
@@ -32,6 +36,12 @@ SUBST_SED.fixver= -e 's,18.0w,25.0w,g'
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}
+.if ${USE_PKGSRC_GCC_RUNTIME:tl} == "yes"
+CONFIGURE_ARGS+= --enable-shared
+.else
+CONFIGURE_ARGS+= --disable-shared
+.endif
+
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
diff --git a/xmlada/buildlink3.mk b/xmlada/buildlink3.mk
index 1c44836bbf..bdcd13ce59 100644
--- a/xmlada/buildlink3.mk
+++ b/xmlada/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.xmlada?= ../../wip/xmlada
BUILDLINK_DEPMETHOD.xmlada?= build
BUILDLINK_CONTENTS_FILTER.xmlada= \
- ${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$)'
+ ${EGREP} '(include/.*\.ad.$$|lib/.*\.ali$$|lib/.*\.a$$|lib/.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$)'
pkgbase := xmlada
.include "../../mk/pkg-build-options.mk"
diff --git a/xmlada/options.mk b/xmlada/options.mk
deleted file mode 100644
index da260c24c5..0000000000
--- a/xmlada/options.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2025/05/09 16:00:00 dkazankov Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.xmlada
-PKG_OPTIONS_OPTIONAL_GROUPS= shared-libs
-PKG_OPTIONS_GROUP.shared-libs= enable-shared-libs disable-shared-libs
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Menable-shared-libs)
-CONFIGURE_ARGS+= --enable-shared
-USE_GCC_RUNTIME= yes
-.endif
-.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
-CONFIGURE_ARGS+= --disable-shared
-.endif
-.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
-USE_GCC_RUNTIME= yes
-.endif
Home |
Main Index |
Thread Index |
Old Index