pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnatcoll-core: lint package, add shlib options handling, reorganize patches
Module Name: pkgsrc-wip
Committed By: Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By: dkazankov
Date: Tue May 20 06:11:47 2025 +0300
Changeset: 38683696b4560f660780807fa0721f17931a4a03
Modified Files:
gnatcoll-core/Makefile
gnatcoll-core/buildlink3.mk
gnatcoll-core/distinfo
gnatcoll-core/patches/patch-core_src_os_unix_libc-wrappers.c
Added Files:
gnatcoll-core/options.mk
Removed Files:
gnatcoll-core/PLIST
gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
gnatcoll-core/patches/patch-core_src_os_unix_gnatcoll-os-libc-dirent.ads
Log Message:
gnatcoll-core: lint package, add shlib options handling, reorganize patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=38683696b4560f660780807fa0721f17931a4a03
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnatcoll-core/Makefile | 35 +-
gnatcoll-core/PLIST | 518 ---------------------
gnatcoll-core/buildlink3.mk | 9 +-
gnatcoll-core/distinfo | 4 +-
gnatcoll-core/options.mk | 23 +
.../patches/patch-core_gnatcoll__core.gpr | 15 -
...ch-core_src_os_unix_gnatcoll-os-libc-dirent.ads | 15 -
.../patches/patch-core_src_os_unix_libc-wrappers.c | 6 +-
8 files changed, 56 insertions(+), 569 deletions(-)
diffs:
diff --git a/gnatcoll-core/Makefile b/gnatcoll-core/Makefile
index 7c9eebaa62..4ec7bf5929 100644
--- a/gnatcoll-core/Makefile
+++ b/gnatcoll-core/Makefile
@@ -1,12 +1,13 @@
# $NetBSD: Makefile,v 1.0 2024/05/06 15:00:00 dkazankov Exp $
-PKGNAME= gnatcoll-core-25.0.0
DISTNAME= gnatcoll-core-${PKGVERSION_NOREV}
+PKGNAME= gnatcoll-core-25.0.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=AdaCore/}
GITHUB_PROJECT= gnatcoll-core
GITHUB_TAG= v${PKGVERSION_NOREV}
+MAINTAINER= dkazankov%NetBSD.org@localhost
HOMEPAGE= https://github.com/AdaCore/gnatcoll-core
COMMENT= The GNAT Components Collection (GNATcoll) - Core packages
LICENSE= gnu-gpl-v3
@@ -14,27 +15,37 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake grep
USE_LANGUAGES= c ada
-
+# See xmlada package for rationale
GCC_REQD+= 13
-MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD ENABLE_SHARED=yes
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} BUILD=PROD
+
+# 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+= opendir
+SUBST_MESSAGE.opendir= Replace opendir with __gnatcoll_opendir in ${SUBST_FILES.opendir}
+SUBST_STAGE.opendir= pre-configure
+SUBST_FILES.opendir= core/src/os/unix/gnatcoll-os-libc-dirent.ads
+SUBST_SED.opendir= -e "s,\"opendir\",\"__gnatcoll_opendir\","
+.endif
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 "../../wip/gprbuild/buildlink3.mk"
-
-BUILDLINK_DEPMETHOD.xmlada= full
+.include "../../devel/gprbuild/buildlink3.mk"
.include "../../wip/xmlada/buildlink3.mk"
-
-BUILDLINK_DEPMETHOD.gprlib= full
.include "../../wip/gprlib/buildlink3.mk"
-PYTHON_VERSIONS_ACCEPTED= 312 311 310 39 38 27
.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnatcoll-core/PLIST b/gnatcoll-core/PLIST
deleted file mode 100644
index 4cbe54aad8..0000000000
--- a/gnatcoll-core/PLIST
+++ /dev/null
@@ -1,518 +0,0 @@
-@comment $NetBSD: PLIST,v 1.0 2024/05/06 13:00:00 dkazankov Exp $
-include/gnatcoll_core/blake3.c
-include/gnatcoll_core/blake3.h
-include/gnatcoll_core/blake3_dispatch.c
-include/gnatcoll_core/blake3_impl.h
-include/gnatcoll_core/blake3_portable.c
-include/gnatcoll_core/executable_path.c
-include/gnatcoll_core/gnatcoll-arg_lists.adb
-include/gnatcoll_core/gnatcoll-arg_lists.ads
-include/gnatcoll_core/gnatcoll-buffer.adb
-include/gnatcoll_core/gnatcoll-buffer.ads
-include/gnatcoll_core/gnatcoll-config.adb
-include/gnatcoll_core/gnatcoll-config.ads
-include/gnatcoll_core/gnatcoll-directed_graph.adb
-include/gnatcoll_core/gnatcoll-directed_graph.ads
-include/gnatcoll_core/gnatcoll-email-mailboxes.adb
-include/gnatcoll_core/gnatcoll-email-mailboxes.ads
-include/gnatcoll_core/gnatcoll-email-parser.adb
-include/gnatcoll_core/gnatcoll-email-parser.ads
-include/gnatcoll_core/gnatcoll-email-utils.adb
-include/gnatcoll_core/gnatcoll-email-utils.ads
-include/gnatcoll_core/gnatcoll-email.adb
-include/gnatcoll_core/gnatcoll-email.ads
-include/gnatcoll_core/gnatcoll-file_indexes.adb
-include/gnatcoll_core/gnatcoll-file_indexes.ads
-include/gnatcoll_core/gnatcoll-file_paths.adb
-include/gnatcoll_core/gnatcoll-file_paths.ads
-include/gnatcoll_core/gnatcoll-format_columns_vertical.ads
-include/gnatcoll_core/gnatcoll-formatters.adb
-include/gnatcoll_core/gnatcoll-formatters.ads
-include/gnatcoll_core/gnatcoll-hash-blake3.adb
-include/gnatcoll_core/gnatcoll-hash-blake3.ads
-include/gnatcoll_core/gnatcoll-hash-xxhash.ads
-include/gnatcoll_core/gnatcoll-hash-xxhash__generic.adb
-include/gnatcoll_core/gnatcoll-hash.ads
-include/gnatcoll_core/gnatcoll-io-native-codec__unix.adb
-include/gnatcoll_core/gnatcoll-io-native.adb
-include/gnatcoll_core/gnatcoll-io-native.ads
-include/gnatcoll_core/gnatcoll-io-remote-unix.adb
-include/gnatcoll_core/gnatcoll-io-remote-unix.ads
-include/gnatcoll_core/gnatcoll-io-remote-windows.adb
-include/gnatcoll_core/gnatcoll-io-remote-windows.ads
-include/gnatcoll_core/gnatcoll-io-remote.adb
-include/gnatcoll_core/gnatcoll-io-remote.ads
-include/gnatcoll_core/gnatcoll-io.adb
-include/gnatcoll_core/gnatcoll-io.ads
-include/gnatcoll_core/gnatcoll-json-utility.adb
-include/gnatcoll_core/gnatcoll-json-utility.ads
-include/gnatcoll_core/gnatcoll-json.adb
-include/gnatcoll_core/gnatcoll-json.ads
-include/gnatcoll_core/gnatcoll-mmap-system__unix.adb
-include/gnatcoll_core/gnatcoll-mmap-system__unix.ads
-include/gnatcoll_core/gnatcoll-mmap.adb
-include/gnatcoll_core/gnatcoll-mmap.ads
-include/gnatcoll_core/gnatcoll-opt_parse.adb
-include/gnatcoll_core/gnatcoll-opt_parse.ads
-include/gnatcoll_core/gnatcoll-os-constants__unix.ads
-include/gnatcoll_core/gnatcoll-os-dir-close__unix.adb
-include/gnatcoll_core/gnatcoll-os-dir-open__unix.adb
-include/gnatcoll_core/gnatcoll-os-dir-read__unix.adb
-include/gnatcoll_core/gnatcoll-os-dir.adb
-include/gnatcoll_core/gnatcoll-os-dir.ads
-include/gnatcoll_core/gnatcoll-os-dir_types__unix.ads
-include/gnatcoll_core/gnatcoll-os-fs-is_console__unix.adb
-include/gnatcoll_core/gnatcoll-os-fs-null_file__unix.adb
-include/gnatcoll_core/gnatcoll-os-fs-open__unix.adb
-include/gnatcoll_core/gnatcoll-os-fs-open_pipe__linux.adb
-include/gnatcoll_core/gnatcoll-os-fs-set_close_on_exec__unix.adb
-include/gnatcoll_core/gnatcoll-os-fs.adb
-include/gnatcoll_core/gnatcoll-os-fs.ads
-include/gnatcoll_core/gnatcoll-os-fsutil-copy_file_content__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-copy_permissions__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-copy_timestamps__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-create_directory__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-create_symbolic_link__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-read_symbolic_link__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-remove_directory__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil-remove_file__unix.adb
-include/gnatcoll_core/gnatcoll-os-fsutil.adb
-include/gnatcoll_core/gnatcoll-os-fsutil.ads
-include/gnatcoll_core/gnatcoll-os-libc-dirent.ads
-include/gnatcoll_core/gnatcoll-os-libc-spawn.ads
-include/gnatcoll_core/gnatcoll-os-libc-stat.ads
-include/gnatcoll_core/gnatcoll-os-libc-utime.ads
-include/gnatcoll_core/gnatcoll-os-libc.ads
-include/gnatcoll_core/gnatcoll-os-libc_constants__linux.ads
-include/gnatcoll_core/gnatcoll-os-process-internal_spawn__unix.adb
-include/gnatcoll_core/gnatcoll-os-process-state__unix.adb
-include/gnatcoll_core/gnatcoll-os-process-wait__unix.adb
-include/gnatcoll_core/gnatcoll-os-process-wait_for_processes__unix.adb
-include/gnatcoll_core/gnatcoll-os-process.adb
-include/gnatcoll_core/gnatcoll-os-process.ads
-include/gnatcoll_core/gnatcoll-os-process_types__unix.adb
-include/gnatcoll_core/gnatcoll-os-process_types__unix.ads
-include/gnatcoll_core/gnatcoll-os-random.ads
-include/gnatcoll_core/gnatcoll-os-random__unix.adb
-include/gnatcoll_core/gnatcoll-os-stat-fstat__unix.adb
-include/gnatcoll_core/gnatcoll-os-stat-stat__unix.adb
-include/gnatcoll_core/gnatcoll-os-stat.adb
-include/gnatcoll_core/gnatcoll-os-stat.ads
-include/gnatcoll_core/gnatcoll-os.ads
-include/gnatcoll_core/gnatcoll-paragraph_filling-badnesses.adb
-include/gnatcoll_core/gnatcoll-paragraph_filling-badnesses.ads
-include/gnatcoll_core/gnatcoll-paragraph_filling-words.adb
-include/gnatcoll_core/gnatcoll-paragraph_filling-words.ads
-include/gnatcoll_core/gnatcoll-paragraph_filling.adb
-include/gnatcoll_core/gnatcoll-paragraph_filling.ads
-include/gnatcoll_core/gnatcoll-path.adb
-include/gnatcoll_core/gnatcoll-path.ads
-include/gnatcoll_core/gnatcoll-plugins.ads
-include/gnatcoll_core/gnatcoll-plugins__unix.adb
-include/gnatcoll_core/gnatcoll-pools.adb
-include/gnatcoll_core/gnatcoll-pools.ads
-include/gnatcoll_core/gnatcoll-random.adb
-include/gnatcoll_core/gnatcoll-random.ads
-include/gnatcoll_core/gnatcoll-remote-db.adb
-include/gnatcoll_core/gnatcoll-remote-db.ads
-include/gnatcoll_core/gnatcoll-remote.ads
-include/gnatcoll_core/gnatcoll-scripts-impl.adb
-include/gnatcoll_core/gnatcoll-scripts-impl.ads
-include/gnatcoll_core/gnatcoll-scripts-utils.adb
-include/gnatcoll_core/gnatcoll-scripts-utils.ads
-include/gnatcoll_core/gnatcoll-scripts.adb
-include/gnatcoll_core/gnatcoll-scripts.ads
-include/gnatcoll_core/gnatcoll-string_builders.adb
-include/gnatcoll_core/gnatcoll-string_builders.ads
-include/gnatcoll_core/gnatcoll-string_list_builders.adb
-include/gnatcoll_core/gnatcoll-string_list_builders.ads
-include/gnatcoll_core/gnatcoll-strings.ads
-include/gnatcoll_core/gnatcoll-strings_impl.adb
-include/gnatcoll_core/gnatcoll-strings_impl.ads
-include/gnatcoll_core/gnatcoll-symbols.adb
-include/gnatcoll_core/gnatcoll-symbols.ads
-include/gnatcoll_core/gnatcoll-templates.adb
-include/gnatcoll_core/gnatcoll-templates.ads
-include/gnatcoll_core/gnatcoll-terminal.adb
-include/gnatcoll_core/gnatcoll-terminal.ads
-include/gnatcoll_core/gnatcoll-traces.adb
-include/gnatcoll_core/gnatcoll-traces.ads
-include/gnatcoll_core/gnatcoll-utils.adb
-include/gnatcoll_core/gnatcoll-utils.ads
-include/gnatcoll_core/gnatcoll-vfs.adb
-include/gnatcoll_core/gnatcoll-vfs.ads
-include/gnatcoll_core/gnatcoll-vfs_types.ads
-include/gnatcoll_core/gnatcoll-vfs_utils.adb
-include/gnatcoll_core/gnatcoll-vfs_utils.ads
-include/gnatcoll_core/gnatcoll-wstring_builders.adb
-include/gnatcoll_core/gnatcoll-wstring_builders.ads
-include/gnatcoll_core/gnatcoll-wstring_list_builders.adb
-include/gnatcoll_core/gnatcoll-wstring_list_builders.ads
-include/gnatcoll_core/gnatcoll_support.c
-include/gnatcoll_core/libc-wrappers.c
-include/gnatcoll_core/link_max.c
-include/gnatcoll_core/objlist_file.c
-include/gnatcoll_core/process-wrappers.c
-include/gnatcoll_core/run_path_option.c
-include/gnatcoll_core/separate_run_path_option.c
-include/gnatcoll_core/set_std_prefix.c
-include/gnatcoll_core/terminals.c
-include/gnatcoll_core/update_path.c
-include/gnatcoll_core/xxhash.c
-include/gnatcoll_core/xxhash.h
-include/gnatcoll_minimal/getRSS.c
-include/gnatcoll_minimal/gnatcoll-any_types.adb
-include/gnatcoll_minimal/gnatcoll-any_types.ads
-include/gnatcoll_minimal/gnatcoll-asserts.adb
-include/gnatcoll_minimal/gnatcoll-asserts.ads
-include/gnatcoll_minimal/gnatcoll-atomic.adb
-include/gnatcoll_minimal/gnatcoll-atomic.ads
-include/gnatcoll_minimal/gnatcoll-boyer_moore.adb
-include/gnatcoll_minimal/gnatcoll-boyer_moore.ads
-include/gnatcoll_minimal/gnatcoll-coders-base64.adb
-include/gnatcoll_minimal/gnatcoll-coders-base64.ads
-include/gnatcoll_minimal/gnatcoll-coders-streams.adb
-include/gnatcoll_minimal/gnatcoll-coders-streams.ads
-include/gnatcoll_minimal/gnatcoll-coders.adb
-include/gnatcoll_minimal/gnatcoll-coders.ads
-include/gnatcoll_minimal/gnatcoll-damerau_levenshtein_distance.ads
-include/gnatcoll_minimal/gnatcoll-damerau_levenshtein_generic.adb
-include/gnatcoll_minimal/gnatcoll-damerau_levenshtein_generic.ads
-include/gnatcoll_minimal/gnatcoll-locks.adb
-include/gnatcoll_minimal/gnatcoll-locks.ads
-include/gnatcoll_minimal/gnatcoll-memory.adb
-include/gnatcoll_minimal/gnatcoll-memory.ads
-include/gnatcoll_minimal/gnatcoll-promises.adb
-include/gnatcoll_minimal/gnatcoll-promises.ads
-include/gnatcoll_minimal/gnatcoll-refcount-weakref.adb
-include/gnatcoll_minimal/gnatcoll-refcount-weakref.ads
-include/gnatcoll_minimal/gnatcoll-refcount.adb
-include/gnatcoll_minimal/gnatcoll-refcount.ads
-include/gnatcoll_minimal/gnatcoll-storage_pools-alignment.adb
-include/gnatcoll_minimal/gnatcoll-storage_pools-alignment.ads
-include/gnatcoll_minimal/gnatcoll-storage_pools-headers.adb
-include/gnatcoll_minimal/gnatcoll-storage_pools-headers.ads
-include/gnatcoll_minimal/gnatcoll-storage_pools.ads
-include/gnatcoll_minimal/gnatcoll-tribooleans.adb
-include/gnatcoll_minimal/gnatcoll-tribooleans.ads
-include/gnatcoll_minimal/gnatcoll.ads
-include/gnatcoll_minimal/gnatcoll_support.c
-include/gnatcoll_projects/gnatcoll-projects-aux.adb
-include/gnatcoll_projects/gnatcoll-projects-aux.ads
-include/gnatcoll_projects/gnatcoll-projects-krunch.adb
-include/gnatcoll_projects/gnatcoll-projects-krunch.ads
-include/gnatcoll_projects/gnatcoll-projects-normalize.adb
-include/gnatcoll_projects/gnatcoll-projects-normalize.ads
-include/gnatcoll_projects/gnatcoll-projects.adb
-include/gnatcoll_projects/gnatcoll-projects.ads
-include/gnatcoll_projects/gnatcoll-scripts-files.adb
-include/gnatcoll_projects/gnatcoll-scripts-files.ads
-include/gnatcoll_projects/gnatcoll-scripts-projects.adb
-include/gnatcoll_projects/gnatcoll-scripts-projects.ads
-lib/gnatcoll_core.relocatable/gnatcoll-arg_lists.ali
-lib/gnatcoll_core.relocatable/gnatcoll-buffer.ali
-lib/gnatcoll_core.relocatable/gnatcoll-config.ali
-lib/gnatcoll_core.relocatable/gnatcoll-directed_graph.ali
-lib/gnatcoll_core.relocatable/gnatcoll-email-mailboxes.ali
-lib/gnatcoll_core.relocatable/gnatcoll-email-parser.ali
-lib/gnatcoll_core.relocatable/gnatcoll-email-utils.ali
-lib/gnatcoll_core.relocatable/gnatcoll-email.ali
-lib/gnatcoll_core.relocatable/gnatcoll-file_indexes.ali
-lib/gnatcoll_core.relocatable/gnatcoll-file_paths.ali
-lib/gnatcoll_core.relocatable/gnatcoll-format_columns_vertical.ali
-lib/gnatcoll_core.relocatable/gnatcoll-formatters.ali
-lib/gnatcoll_core.relocatable/gnatcoll-hash-blake3.ali
-lib/gnatcoll_core.relocatable/gnatcoll-hash-xxhash__generic.ali
-lib/gnatcoll_core.relocatable/gnatcoll-hash.ali
-lib/gnatcoll_core.relocatable/gnatcoll-io-native.ali
-lib/gnatcoll_core.relocatable/gnatcoll-io-remote-unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-io-remote-windows.ali
-lib/gnatcoll_core.relocatable/gnatcoll-io-remote.ali
-lib/gnatcoll_core.relocatable/gnatcoll-io.ali
-lib/gnatcoll_core.relocatable/gnatcoll-json-utility.ali
-lib/gnatcoll_core.relocatable/gnatcoll-json.ali
-lib/gnatcoll_core.relocatable/gnatcoll-mmap-system__unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-mmap.ali
-lib/gnatcoll_core.relocatable/gnatcoll-opt_parse.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-constants__unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-dir.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-dir_types__unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-fs.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-fsutil.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-libc-dirent.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-libc-spawn.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-libc-stat.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-libc-utime.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-libc.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-libc_constants__linux.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-process.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-process_types__unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-random__unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os-stat.ali
-lib/gnatcoll_core.relocatable/gnatcoll-os.ali
-lib/gnatcoll_core.relocatable/gnatcoll-paragraph_filling-badnesses.ali
-lib/gnatcoll_core.relocatable/gnatcoll-paragraph_filling-words.ali
-lib/gnatcoll_core.relocatable/gnatcoll-paragraph_filling.ali
-lib/gnatcoll_core.relocatable/gnatcoll-path.ali
-lib/gnatcoll_core.relocatable/gnatcoll-plugins__unix.ali
-lib/gnatcoll_core.relocatable/gnatcoll-pools.ali
-lib/gnatcoll_core.relocatable/gnatcoll-random.ali
-lib/gnatcoll_core.relocatable/gnatcoll-remote-db.ali
-lib/gnatcoll_core.relocatable/gnatcoll-remote.ali
-lib/gnatcoll_core.relocatable/gnatcoll-scripts-impl.ali
-lib/gnatcoll_core.relocatable/gnatcoll-scripts-utils.ali
-lib/gnatcoll_core.relocatable/gnatcoll-scripts.ali
-lib/gnatcoll_core.relocatable/gnatcoll-string_builders.ali
-lib/gnatcoll_core.relocatable/gnatcoll-string_list_builders.ali
-lib/gnatcoll_core.relocatable/gnatcoll-strings.ali
-lib/gnatcoll_core.relocatable/gnatcoll-strings_impl.ali
-lib/gnatcoll_core.relocatable/gnatcoll-symbols.ali
-lib/gnatcoll_core.relocatable/gnatcoll-templates.ali
-lib/gnatcoll_core.relocatable/gnatcoll-terminal.ali
-lib/gnatcoll_core.relocatable/gnatcoll-traces.ali
-lib/gnatcoll_core.relocatable/gnatcoll-utils.ali
-lib/gnatcoll_core.relocatable/gnatcoll-vfs.ali
-lib/gnatcoll_core.relocatable/gnatcoll-vfs_types.ali
-lib/gnatcoll_core.relocatable/gnatcoll-vfs_utils.ali
-lib/gnatcoll_core.relocatable/gnatcoll-wstring_builders.ali
-lib/gnatcoll_core.relocatable/gnatcoll-wstring_list_builders.ali
-lib/gnatcoll_core.relocatable/libgnatcoll_core.so
-lib/gnatcoll_core.relocatable/libgnatcoll_core.so.25
-lib/gnatcoll_core.relocatable/libgnatcoll_core.so.25.0
-lib/gnatcoll_core.static-pic/gnatcoll-arg_lists.ali
-lib/gnatcoll_core.static-pic/gnatcoll-buffer.ali
-lib/gnatcoll_core.static-pic/gnatcoll-config.ali
-lib/gnatcoll_core.static-pic/gnatcoll-directed_graph.ali
-lib/gnatcoll_core.static-pic/gnatcoll-email-mailboxes.ali
-lib/gnatcoll_core.static-pic/gnatcoll-email-parser.ali
-lib/gnatcoll_core.static-pic/gnatcoll-email-utils.ali
-lib/gnatcoll_core.static-pic/gnatcoll-email.ali
-lib/gnatcoll_core.static-pic/gnatcoll-file_indexes.ali
-lib/gnatcoll_core.static-pic/gnatcoll-file_paths.ali
-lib/gnatcoll_core.static-pic/gnatcoll-format_columns_vertical.ali
-lib/gnatcoll_core.static-pic/gnatcoll-formatters.ali
-lib/gnatcoll_core.static-pic/gnatcoll-hash-blake3.ali
-lib/gnatcoll_core.static-pic/gnatcoll-hash-xxhash__generic.ali
-lib/gnatcoll_core.static-pic/gnatcoll-hash.ali
-lib/gnatcoll_core.static-pic/gnatcoll-io-native.ali
-lib/gnatcoll_core.static-pic/gnatcoll-io-remote-unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-io-remote-windows.ali
-lib/gnatcoll_core.static-pic/gnatcoll-io-remote.ali
-lib/gnatcoll_core.static-pic/gnatcoll-io.ali
-lib/gnatcoll_core.static-pic/gnatcoll-json-utility.ali
-lib/gnatcoll_core.static-pic/gnatcoll-json.ali
-lib/gnatcoll_core.static-pic/gnatcoll-mmap-system__unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-mmap.ali
-lib/gnatcoll_core.static-pic/gnatcoll-opt_parse.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-constants__unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-dir.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-dir_types__unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-fs.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-fsutil.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-libc-dirent.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-libc-spawn.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-libc-stat.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-libc-utime.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-libc.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-libc_constants__linux.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-process.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-process_types__unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-random__unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os-stat.ali
-lib/gnatcoll_core.static-pic/gnatcoll-os.ali
-lib/gnatcoll_core.static-pic/gnatcoll-paragraph_filling-badnesses.ali
-lib/gnatcoll_core.static-pic/gnatcoll-paragraph_filling-words.ali
-lib/gnatcoll_core.static-pic/gnatcoll-paragraph_filling.ali
-lib/gnatcoll_core.static-pic/gnatcoll-path.ali
-lib/gnatcoll_core.static-pic/gnatcoll-plugins__unix.ali
-lib/gnatcoll_core.static-pic/gnatcoll-pools.ali
-lib/gnatcoll_core.static-pic/gnatcoll-random.ali
-lib/gnatcoll_core.static-pic/gnatcoll-remote-db.ali
-lib/gnatcoll_core.static-pic/gnatcoll-remote.ali
-lib/gnatcoll_core.static-pic/gnatcoll-scripts-impl.ali
-lib/gnatcoll_core.static-pic/gnatcoll-scripts-utils.ali
-lib/gnatcoll_core.static-pic/gnatcoll-scripts.ali
-lib/gnatcoll_core.static-pic/gnatcoll-string_builders.ali
-lib/gnatcoll_core.static-pic/gnatcoll-string_list_builders.ali
-lib/gnatcoll_core.static-pic/gnatcoll-strings.ali
-lib/gnatcoll_core.static-pic/gnatcoll-strings_impl.ali
-lib/gnatcoll_core.static-pic/gnatcoll-symbols.ali
-lib/gnatcoll_core.static-pic/gnatcoll-templates.ali
-lib/gnatcoll_core.static-pic/gnatcoll-terminal.ali
-lib/gnatcoll_core.static-pic/gnatcoll-traces.ali
-lib/gnatcoll_core.static-pic/gnatcoll-utils.ali
-lib/gnatcoll_core.static-pic/gnatcoll-vfs.ali
-lib/gnatcoll_core.static-pic/gnatcoll-vfs_types.ali
-lib/gnatcoll_core.static-pic/gnatcoll-vfs_utils.ali
-lib/gnatcoll_core.static-pic/gnatcoll-wstring_builders.ali
-lib/gnatcoll_core.static-pic/gnatcoll-wstring_list_builders.ali
-lib/gnatcoll_core.static-pic/libgnatcoll_core.a
-lib/gnatcoll_core.static/gnatcoll-arg_lists.ali
-lib/gnatcoll_core.static/gnatcoll-buffer.ali
-lib/gnatcoll_core.static/gnatcoll-config.ali
-lib/gnatcoll_core.static/gnatcoll-directed_graph.ali
-lib/gnatcoll_core.static/gnatcoll-email-mailboxes.ali
-lib/gnatcoll_core.static/gnatcoll-email-parser.ali
-lib/gnatcoll_core.static/gnatcoll-email-utils.ali
-lib/gnatcoll_core.static/gnatcoll-email.ali
-lib/gnatcoll_core.static/gnatcoll-file_indexes.ali
-lib/gnatcoll_core.static/gnatcoll-file_paths.ali
-lib/gnatcoll_core.static/gnatcoll-format_columns_vertical.ali
-lib/gnatcoll_core.static/gnatcoll-formatters.ali
-lib/gnatcoll_core.static/gnatcoll-hash-blake3.ali
-lib/gnatcoll_core.static/gnatcoll-hash-xxhash__generic.ali
-lib/gnatcoll_core.static/gnatcoll-hash.ali
-lib/gnatcoll_core.static/gnatcoll-io-native.ali
-lib/gnatcoll_core.static/gnatcoll-io-remote-unix.ali
-lib/gnatcoll_core.static/gnatcoll-io-remote-windows.ali
-lib/gnatcoll_core.static/gnatcoll-io-remote.ali
-lib/gnatcoll_core.static/gnatcoll-io.ali
-lib/gnatcoll_core.static/gnatcoll-json-utility.ali
-lib/gnatcoll_core.static/gnatcoll-json.ali
-lib/gnatcoll_core.static/gnatcoll-mmap-system__unix.ali
-lib/gnatcoll_core.static/gnatcoll-mmap.ali
-lib/gnatcoll_core.static/gnatcoll-opt_parse.ali
-lib/gnatcoll_core.static/gnatcoll-os-constants__unix.ali
-lib/gnatcoll_core.static/gnatcoll-os-dir.ali
-lib/gnatcoll_core.static/gnatcoll-os-dir_types__unix.ali
-lib/gnatcoll_core.static/gnatcoll-os-fs.ali
-lib/gnatcoll_core.static/gnatcoll-os-fsutil.ali
-lib/gnatcoll_core.static/gnatcoll-os-libc-dirent.ali
-lib/gnatcoll_core.static/gnatcoll-os-libc-spawn.ali
-lib/gnatcoll_core.static/gnatcoll-os-libc-stat.ali
-lib/gnatcoll_core.static/gnatcoll-os-libc-utime.ali
-lib/gnatcoll_core.static/gnatcoll-os-libc.ali
-lib/gnatcoll_core.static/gnatcoll-os-libc_constants__linux.ali
-lib/gnatcoll_core.static/gnatcoll-os-process.ali
-lib/gnatcoll_core.static/gnatcoll-os-process_types__unix.ali
-lib/gnatcoll_core.static/gnatcoll-os-random__unix.ali
-lib/gnatcoll_core.static/gnatcoll-os-stat.ali
-lib/gnatcoll_core.static/gnatcoll-os.ali
-lib/gnatcoll_core.static/gnatcoll-paragraph_filling-badnesses.ali
-lib/gnatcoll_core.static/gnatcoll-paragraph_filling-words.ali
-lib/gnatcoll_core.static/gnatcoll-paragraph_filling.ali
-lib/gnatcoll_core.static/gnatcoll-path.ali
-lib/gnatcoll_core.static/gnatcoll-plugins__unix.ali
-lib/gnatcoll_core.static/gnatcoll-pools.ali
-lib/gnatcoll_core.static/gnatcoll-random.ali
-lib/gnatcoll_core.static/gnatcoll-remote-db.ali
-lib/gnatcoll_core.static/gnatcoll-remote.ali
-lib/gnatcoll_core.static/gnatcoll-scripts-impl.ali
-lib/gnatcoll_core.static/gnatcoll-scripts-utils.ali
-lib/gnatcoll_core.static/gnatcoll-scripts.ali
-lib/gnatcoll_core.static/gnatcoll-string_builders.ali
-lib/gnatcoll_core.static/gnatcoll-string_list_builders.ali
-lib/gnatcoll_core.static/gnatcoll-strings.ali
-lib/gnatcoll_core.static/gnatcoll-strings_impl.ali
-lib/gnatcoll_core.static/gnatcoll-symbols.ali
-lib/gnatcoll_core.static/gnatcoll-templates.ali
-lib/gnatcoll_core.static/gnatcoll-terminal.ali
-lib/gnatcoll_core.static/gnatcoll-traces.ali
-lib/gnatcoll_core.static/gnatcoll-utils.ali
-lib/gnatcoll_core.static/gnatcoll-vfs.ali
-lib/gnatcoll_core.static/gnatcoll-vfs_types.ali
-lib/gnatcoll_core.static/gnatcoll-vfs_utils.ali
-lib/gnatcoll_core.static/gnatcoll-wstring_builders.ali
-lib/gnatcoll_core.static/gnatcoll-wstring_list_builders.ali
-lib/gnatcoll_core.static/libgnatcoll_core.a
-lib/gnatcoll_minimal.relocatable/gnatcoll-any_types.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-asserts.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-atomic.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-boyer_moore.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-coders-base64.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-coders-streams.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-coders.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-damerau_levenshtein_distance.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-damerau_levenshtein_generic.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-locks.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-memory.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-promises.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-refcount-weakref.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-refcount.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-storage_pools-alignment.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-storage_pools-headers.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-storage_pools.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll-tribooleans.ali
-lib/gnatcoll_minimal.relocatable/gnatcoll.ali
-lib/gnatcoll_minimal.relocatable/libgnatcoll_minimal.so
-lib/gnatcoll_minimal.relocatable/libgnatcoll_minimal.so.25
-lib/gnatcoll_minimal.relocatable/libgnatcoll_minimal.so.25.0
-lib/gnatcoll_minimal.static-pic/gnatcoll-any_types.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-asserts.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-atomic.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-boyer_moore.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-coders-base64.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-coders-streams.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-coders.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-damerau_levenshtein_distance.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-damerau_levenshtein_generic.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-locks.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-memory.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-promises.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-refcount-weakref.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-refcount.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-storage_pools-alignment.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-storage_pools-headers.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-storage_pools.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll-tribooleans.ali
-lib/gnatcoll_minimal.static-pic/gnatcoll.ali
-lib/gnatcoll_minimal.static-pic/libgnatcoll_minimal.a
-lib/gnatcoll_minimal.static/gnatcoll-any_types.ali
-lib/gnatcoll_minimal.static/gnatcoll-asserts.ali
-lib/gnatcoll_minimal.static/gnatcoll-atomic.ali
-lib/gnatcoll_minimal.static/gnatcoll-boyer_moore.ali
-lib/gnatcoll_minimal.static/gnatcoll-coders-base64.ali
-lib/gnatcoll_minimal.static/gnatcoll-coders-streams.ali
-lib/gnatcoll_minimal.static/gnatcoll-coders.ali
-lib/gnatcoll_minimal.static/gnatcoll-damerau_levenshtein_distance.ali
-lib/gnatcoll_minimal.static/gnatcoll-damerau_levenshtein_generic.ali
-lib/gnatcoll_minimal.static/gnatcoll-locks.ali
-lib/gnatcoll_minimal.static/gnatcoll-memory.ali
-lib/gnatcoll_minimal.static/gnatcoll-promises.ali
-lib/gnatcoll_minimal.static/gnatcoll-refcount-weakref.ali
-lib/gnatcoll_minimal.static/gnatcoll-refcount.ali
-lib/gnatcoll_minimal.static/gnatcoll-storage_pools-alignment.ali
-lib/gnatcoll_minimal.static/gnatcoll-storage_pools-headers.ali
-lib/gnatcoll_minimal.static/gnatcoll-storage_pools.ali
-lib/gnatcoll_minimal.static/gnatcoll-tribooleans.ali
-lib/gnatcoll_minimal.static/gnatcoll.ali
-lib/gnatcoll_minimal.static/libgnatcoll_minimal.a
-lib/gnatcoll_projects.relocatable/gnatcoll-projects-aux.ali
-lib/gnatcoll_projects.relocatable/gnatcoll-projects-krunch.ali
-lib/gnatcoll_projects.relocatable/gnatcoll-projects-normalize.ali
-lib/gnatcoll_projects.relocatable/gnatcoll-projects.ali
-lib/gnatcoll_projects.relocatable/gnatcoll-scripts-files.ali
-lib/gnatcoll_projects.relocatable/gnatcoll-scripts-projects.ali
-lib/gnatcoll_projects.relocatable/libgnatcoll_projects.so
-lib/gnatcoll_projects.relocatable/libgnatcoll_projects.so.25
-lib/gnatcoll_projects.relocatable/libgnatcoll_projects.so.25.0
-lib/gnatcoll_projects.static-pic/gnatcoll-projects-aux.ali
-lib/gnatcoll_projects.static-pic/gnatcoll-projects-krunch.ali
-lib/gnatcoll_projects.static-pic/gnatcoll-projects-normalize.ali
-lib/gnatcoll_projects.static-pic/gnatcoll-projects.ali
-lib/gnatcoll_projects.static-pic/gnatcoll-scripts-files.ali
-lib/gnatcoll_projects.static-pic/gnatcoll-scripts-projects.ali
-lib/gnatcoll_projects.static-pic/libgnatcoll_projects.a
-lib/gnatcoll_projects.static/gnatcoll-projects-aux.ali
-lib/gnatcoll_projects.static/gnatcoll-projects-krunch.ali
-lib/gnatcoll_projects.static/gnatcoll-projects-normalize.ali
-lib/gnatcoll_projects.static/gnatcoll-projects.ali
-lib/gnatcoll_projects.static/gnatcoll-scripts-files.ali
-lib/gnatcoll_projects.static/gnatcoll-scripts-projects.ali
-lib/gnatcoll_projects.static/libgnatcoll_projects.a
-lib/libgnatcoll_core.so
-lib/libgnatcoll_core.so.25
-lib/libgnatcoll_core.so.25.0
-lib/libgnatcoll_minimal.so
-lib/libgnatcoll_minimal.so.25
-lib/libgnatcoll_minimal.so.25.0
-lib/libgnatcoll_projects.so
-lib/libgnatcoll_projects.so.25
-lib/libgnatcoll_projects.so.25.0
-share/gpr/gnatcoll.gpr
-share/gpr/gnatcoll_core.gpr
-share/gpr/gnatcoll_minimal.gpr
-share/gpr/gnatcoll_projects.gpr
-share/gpr/manifests/gnatcoll_core
-share/gpr/manifests/gnatcoll_minimal
-share/gpr/manifests/gnatcoll_projects
diff --git a/gnatcoll-core/buildlink3.mk b/gnatcoll-core/buildlink3.mk
index 1257689693..d622230786 100644
--- a/gnatcoll-core/buildlink3.mk
+++ b/gnatcoll-core/buildlink3.mk
@@ -6,15 +6,16 @@ BUILDLINK_TREE+= gnatcoll-core
GNATCOLL_CORE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnatcoll-core+= gnatcoll-core>=24.0.0
-BUILDLINK_PKGSRCDIR.gnatcoll-core= ../../wip/gnatcoll-core
+BUILDLINK_ABI_DEPENDS.gnatcoll-core+= gnatcoll-core>=25.0.0
+BUILDLINK_PKGSRCDIR.gnatcoll-core?= ../../wip/gnatcoll-core
BUILDLINK_DEPMETHOD.gnatcoll-core?= build
-BUILDLINK_FILES.gnatcoll-core= include/gnatcoll*/* lib/libgnatcoll* lib/gnatcoll.*/*
-BUILDLINK_FILES.gnatcoll-core+= share/gpr/manifests/gnatcoll* share/gpr/gnatcoll*.gpr
-
BUILDLINK_CONTENTS_FILTER.gnatcoll-core= \
${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatcoll.*$$|share/gpr/manifests/gnatcoll.*|share/gpr/gnatcoll.*\.gpr$$)'
+pkgbase := gnatcoll-core
+.include "../../mk/pkg-build-options.mk"
+
.endif
BUILDLINK_TREE+= -gnatcoll-core
diff --git a/gnatcoll-core/distinfo b/gnatcoll-core/distinfo
index 78d7815d79..e33bb9fc48 100644
--- a/gnatcoll-core/distinfo
+++ b/gnatcoll-core/distinfo
@@ -4,10 +4,8 @@ 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) = 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
+SHA1 (patch-core_src_os_unix_libc-wrappers.c) = 322ecd62a2b35febec07f1195b4cfd2f098a2556
SHA1 (patch-core_src_os_unix_process-wrappers.c) = ef3696e8098b9ca434a83093aa53698c578fd0cc
SHA1 (patch-gprproject_____init____.py) = ac5ac38f93b4b6e11627aecc2cca84e3d3d6c4e6
SHA1 (patch-gprproject_gprbuild.py) = 96bbf5565e72465da06e53c1eb38c81f1e3c3af7
diff --git a/gnatcoll-core/options.mk b/gnatcoll-core/options.mk
new file mode 100644
index 0000000000..6448f34332
--- /dev/null
+++ b/gnatcoll-core/options.mk
@@ -0,0 +1,23 @@
+# $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-core/patches/patch-core_gnatcoll__core.gpr b/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
deleted file mode 100644
index 95278d10f6..0000000000
--- a/gnatcoll-core/patches/patch-core_gnatcoll__core.gpr
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-core_gnatcoll__core.gpr,v 1.0 2024/05/17 18:00:00 dkazankov Exp $
-
-Fix extra libs on NetBSD
-
---- core/gnatcoll_core.gpr.orig 2024-09-24 12:28:32.000000000 +0300
-+++ core/gnatcoll_core.gpr
-@@ -154,7 +154,7 @@
- end case;
- case OS is
- when "unix" =>
-- Extra_Libs := Extra_Libs & ("-ldl"); -- For gnatcoll.plugins
-+ null;
- when others =>
- null;
- end case;
diff --git a/gnatcoll-core/patches/patch-core_src_os_unix_gnatcoll-os-libc-dirent.ads b/gnatcoll-core/patches/patch-core_src_os_unix_gnatcoll-os-libc-dirent.ads
deleted file mode 100644
index 74241a8424..0000000000
--- a/gnatcoll-core/patches/patch-core_src_os_unix_gnatcoll-os-libc-dirent.ads
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-core_src_os_unix_gnatcoll-os-libc-dirent.ads,v 1.0 2024/11/27 10:00:00 dkazankov Exp $
-
-Fix linker version warning on NetBSD
-
---- core/src/os/unix/gnatcoll-os-libc-dirent.ads.orig 2024-09-24 12:28:32.000000000 +0300
-+++ core/src/os/unix/gnatcoll-os-libc-dirent.ads
-@@ -41,7 +41,7 @@
- function Opendir (Path : C_String) return Dir_Handle
- with Import => True,
- Convention => C,
-- External_Name => "opendir";
-+ External_Name => "__gnatcoll_opendir";
-
- function Closedir (Dir : Dir_Handle) return Libc_Status
- with Import => True,
diff --git a/gnatcoll-core/patches/patch-core_src_os_unix_libc-wrappers.c b/gnatcoll-core/patches/patch-core_src_os_unix_libc-wrappers.c
index b5e45e6b11..43a8dfb37f 100644
--- a/gnatcoll-core/patches/patch-core_src_os_unix_libc-wrappers.c
+++ b/gnatcoll-core/patches/patch-core_src_os_unix_libc-wrappers.c
@@ -5,19 +5,21 @@ Add NetBSD support
--- core/src/os/unix/libc-wrappers.c.orig 2024-09-24 12:28:32.000000000 +0300
+++ core/src/os/unix/libc-wrappers.c
-@@ -400,6 +400,11 @@
+@@ -400,6 +400,13 @@
char name[GNATCOLL_DIRENT_NAME_MAX];
};
++#if defined(__NetBSD__)
+DIR * __gnatcoll_opendir(const char *filename)
+{
+ return opendir(filename);
+}
++#endif
+
void __gnatcoll_readdir(DIR *dirp, struct gnatcoll_dirent *buf)
{
struct dirent *result;
-@@ -409,7 +414,7 @@
+@@ -409,7 +416,7 @@
if (result != NULL)
{
buf->inode = (uint_64) result->d_ino;
Home |
Main Index |
Thread Index |
Old Index