[packages/db6.0] Rel 2

[arekm]

commit ef083a62eefa889d6a617cbea775ca0a80f0e230
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:05:55 2026 +0200

    Rel 2

 db6.0-tls-null.patch | 33 +++++++++++++++++++++++++++++++++
 db6.0.spec           | 21 +++++++++++++--------
 2 files changed, 46 insertions(+), 8 deletions(-)
---
diff --git a/db6.0.spec b/db6.0.spec
index e8bbe49..d5ece92 100644
--- a/db6.0.spec
+++ b/db6.0.spec
@@ -7,8 +7,6 @@
 %bcond_with	default_db	# use this db as default system db [Th uses DB 5.3]
 %bcond_with	rpm_db		# install library to rootfs for /bin/rpm
 
-%{load:/usr/lib/rpm/macros.d/java}
-
 %define		major		6
 %define		libver		%{major}.0
 %define		ver		%{libver}.35
@@ -17,7 +15,7 @@ Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db6.0
 Version:	%{ver}.%{patchlevel}
-Release:	1
+Release:	2
 License:	AGPL v3
 Group:		Libraries
 #Source0Download: http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html
@@ -27,6 +25,7 @@ Source0:	http://distfiles.gentoo.org/distfiles/db-%{ver}.tar.gz
 # Source0-md5:	c65a4d3e930a116abaaf69edfc697f25
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-sql-features.patch
+Patch2:		%{name}-tls-null.patch
 URL:		http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 BuildRequires:	automake
 %if %{with java}
@@ -374,6 +373,7 @@ poleceń.
 %setup -q -n db-%{ver}
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub dist
@@ -381,6 +381,8 @@ cp -f /usr/share/automake/config.sub dist
 JAVACFLAGS="-source 1.5 -target 1.5"
 export JAVACFLAGS
 
+%define		configuredir	../dist
+
 %if %{with static_libs}
 cp -a build_unix build_unix.static
 
@@ -388,12 +390,12 @@ cd build_unix.static
 
 CC="%{__cc}"
 CXX="%{__cxx}"
-CFLAGS="%{rpmcflags}"
+CFLAGS="%{rpmcflags} -std=gnu17"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
 LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
-../dist/%configure \
+%configure \
 	--disable-shared \
 	--enable-static \
 	--enable-compat185 \
@@ -411,9 +413,12 @@ cd ..
 
 cd build_unix
 
-../dist/%configure \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
+unset CFLAGS CXXFLAGS LDFLAGS
+%{set_build_flags}
+CFLAGS="$CFLAGS -std=gnu17"
+export CFLAGS
+
+%configure \
 	--enable-shared \
 	--disable-static \
 	--enable-compat185 \
diff --git a/db6.0-tls-null.patch b/db6.0-tls-null.patch
new file mode 100644
index 0000000..44fe173
--- /dev/null
+++ b/db6.0-tls-null.patch
@@ -0,0 +1,33 @@
+--- db-6.0.35/dist/aclocal/tls.m4.orig	2026-05-20 23:55:47.106217384 +0200
++++ db-6.0.35/dist/aclocal/tls.m4	2026-05-20 23:55:47.113062014 +0200
+@@ -21,10 +21,10 @@
+               class TLSClass2 {
+               public: static ] $ax_tls_decl_keyword [int tlsvar;
+               };
+-              template<typename T> ] $ax_tls_defn_keyword [ T* TLSClass<T>::tlsvar = NULL;]
++              template<typename T> ] $ax_tls_defn_keyword [ T* TLSClass<T>::tlsvar = 0;]
+               $ax_tls_defn_keyword [int TLSClass2::tlsvar = 1; 
+               static $ax_tls_decl_keyword int x = 0;],
+-              [TLSClass<int>::tlsvar = NULL; TLSClass2::tlsvar = 1;],
++              [TLSClass<int>::tlsvar = 0; TLSClass2::tlsvar = 1;],
+               [ac_cv_tls=modifier ; break])
+       done
+       test "$ac_cv_tls" = none || break
+--- db-6.0.35/dist/configure.orig	2026-05-20 23:55:47.109550718 +0200
++++ db-6.0.35/dist/configure	2026-05-20 23:55:47.116217385 +0200
+@@ -19183,13 +19183,13 @@
+               class TLSClass2 {
+               public: static  $ax_tls_decl_keyword int tlsvar;
+               };
+-              template<typename T>  $ax_tls_defn_keyword  T* TLSClass<T>::tlsvar = NULL;
++              template<typename T>  $ax_tls_defn_keyword  T* TLSClass<T>::tlsvar = 0;
+               $ax_tls_defn_keyword int TLSClass2::tlsvar = 1;
+               static $ax_tls_decl_keyword int x = 0;
+ int
+ main ()
+ {
+-TLSClass<int>::tlsvar = NULL; TLSClass2::tlsvar = 1;
++TLSClass<int>::tlsvar = 0; TLSClass2::tlsvar = 1;
+   ;
+   return 0;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/db6.0.git/commitdiff/ef083a62eefa889d6a617cbea775ca0a80f0e230