pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sra-tools: Unbreak build under latest Xcode



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Thu Aug 21 13:27:49 2025 -0500
Changeset:	6d81fca83cda0ccb07e9122912ac40b7e463341d

Modified Files:
	sra-tools/distinfo
Added Files:
	sra-tools/patches/patch-ncbi-vdb_interfaces_os_mac_os-native.h
	sra-tools/patches/patch-ncbi-vdb_libs_ext_zlib_zutil.h

Log Message:
sra-tools: Unbreak build under latest Xcode

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

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

diffstat:
 sra-tools/distinfo                                 |  2 ++
 .../patch-ncbi-vdb_interfaces_os_mac_os-native.h   | 22 ++++++++++++++++++++++
 .../patches/patch-ncbi-vdb_libs_ext_zlib_zutil.h   | 15 +++++++++++++++
 3 files changed, 39 insertions(+)

diffs:
diff --git a/sra-tools/distinfo b/sra-tools/distinfo
index 030ca08732..d8782e047b 100644
--- a/sra-tools/distinfo
+++ b/sra-tools/distinfo
@@ -8,6 +8,8 @@ SHA512 (sra-tools-3.2.1.tar.gz) = c8f4b6c2d4746365598374369ba656cadd3af02739b3ea
 Size (sra-tools-3.2.1.tar.gz) = 66684089 bytes
 SHA1 (patch-build_env.cmake) = 7c95dbe65c818ac638754ba6165eab1e613fe0eb
 SHA1 (patch-libs_kxml_xml.c) = 730d87cbf12c74652b0e236884b3a186029f2dec
+SHA1 (patch-ncbi-vdb_interfaces_os_mac_os-native.h) = 30f9266b3bd27846ea971a1e2ee7517fbe0d854d
+SHA1 (patch-ncbi-vdb_libs_ext_zlib_zutil.h) = 73e03cce5e24257ae15891ababb2aff30a8ff510
 SHA1 (patch-ncbi-vdb_libs_kproc_bsd_sysmgr.c) = f49eb28f8bfeb528c1d7c2e9d184502b9eba273c
 SHA1 (patch-ngs_ngs-java_CMakeLists.txt) = 44b822381fd564d045406cc926f807adae9fbe59
 SHA1 (patch-ngs_ngs-python_examples_CMakeLists.txt) = a8a01d17a27c060c08311ab8571ae10af265781d
diff --git a/sra-tools/patches/patch-ncbi-vdb_interfaces_os_mac_os-native.h b/sra-tools/patches/patch-ncbi-vdb_interfaces_os_mac_os-native.h
new file mode 100644
index 0000000000..66d754e23e
--- /dev/null
+++ b/sra-tools/patches/patch-ncbi-vdb_interfaces_os_mac_os-native.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+# Unbreak build under latest Xcode
+
+--- ncbi-vdb/interfaces/os/mac/os-native.h.orig	2025-08-21 18:23:20.418291610 +0000
++++ ncbi-vdb/interfaces/os/mac/os-native.h
+@@ -66,6 +66,7 @@ char *strndup ( const char *str, size_t
+ }
+ #endif
+ 
++#if defined(__APPLE__) && __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ < 150000
+ /*--------------------------------------------------------------------------
+  * strchrnul - implemented inline here
+  */
+@@ -77,6 +78,7 @@ char *strchrnul ( const char *str, int c
+         ( void ) 0;
+     return & ( ( char* ) str ) [ i ];
+ }
++#endif
+ 
+ /*--------------------------------------------------------------------------
+  * memchr - implemented inline here
diff --git a/sra-tools/patches/patch-ncbi-vdb_libs_ext_zlib_zutil.h b/sra-tools/patches/patch-ncbi-vdb_libs_ext_zlib_zutil.h
new file mode 100644
index 0000000000..9a370166be
--- /dev/null
+++ b/sra-tools/patches/patch-ncbi-vdb_libs_ext_zlib_zutil.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+# Unbreak build under latest Xcode
+
+--- ncbi-vdb/libs/ext/zlib/zutil.h.orig	2025-08-21 18:12:04.202560252 +0000
++++ ncbi-vdb/libs/ext/zlib/zutil.h
+@@ -137,7 +137,7 @@ extern z_const char * const z_errmsg[10]
+ #  endif
+ #endif
+ 
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if (defined(MACOS) || defined(TARGET_OS_MAC)) && (__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ < 150000)
+ #  define OS_CODE  7
+ #  ifndef Z_SOLO
+ #    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os


Home | Main Index | Thread Index | Old Index