Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages / db
Commits:
b452cba5 by Benjamin Schneider at 2025-08-01T18:18:42-07:00
fix: FTBFS gcc15, dbstl_container patch
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + db-4.8.30-tls-configure.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -8,6 +8,8 @@ pkgbase = db
depends = gcc-libs
depends = sh
source = https://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
+ source = db-4.8.30-tls-configure.patch
b2sums =
d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46
+ b2sums =
0649b13b88b6fd999bcf94fd531c9b013ec599877d6f30dfd7daff97c7db0d405a4bb709bd01b3080dec440785c7156f6716e96aaaf63ca6e706fa2da7357da4
pkgname = db
=====================================
PKGBUILD
=====================================
@@ -11,11 +11,24 @@ arch=(x86_64)
url='https://www.oracle.com/technology/software/products/berkeley-db/index.html'
license=(AGPL-3.0-only)
depends=(gcc-libs sh)
-source=(https://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-b2sums=('d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46')
+source=(https://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz
+ db-4.8.30-tls-configure.patch)
+b2sums=('d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46'
+
'0649b13b88b6fd999bcf94fd531c9b013ec599877d6f30dfd7daff97c7db0d405a4bb709bd01b3080dec440785c7156f6716e96aaaf63ca6e706fa2da7357da4')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # fix dbstl_container build error
+ patch -Np1 -i ../db-4.8.30-tls-configure.patch
+
+ cd dist
+ ./s_config
+}
build() {
cd ${pkgname}-${pkgver}/build_unix
+ export CFLAGS+=" -std=gnu99"
../dist/configure \
--prefix=/usr \
--enable-compat185 \
=====================================
db-4.8.30-tls-configure.patch
=====================================
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/898074
+https://bugs.gentoo.org/918936
+
+-ignoreme: warning: incompatible pointer to integer conversion passing
'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t'
(aka 'unsigned int'); remove & [-Wint-conversion]
++ignoreme: error: incompatible pointer to integer conversion passing
'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t'
(aka 'unsigned int'); remove & [-Wint-conversion]
+ 34 | return (void *)pthread_getspecific(&key);
+ | ^~~~
+ /usr/include/pthread.h:1305:49: note: passing argument to parameter '__key'
here
+ 1305 | extern void *pthread_getspecific (pthread_key_t __key) __THROW;
+ | ^
+-ignoreme: warning: incompatible pointer to integer conversion passing
'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t'
(aka 'unsigned int'); remove & [-Wint-conversion]
++ignoreme: error: incompatible pointer to integer conversion passing
'pthread_key_t *' (aka 'unsigned int *') to parameter of type 'pthread_key_t'
(aka 'unsigned int'); remove & [-Wint-conversion]
+ 37 | pthread_setspecific(&key, p);
+ | ^~~~
+ /usr/include/pthread.h:1308:47: note: passing argument to parameter '__key'
here
+ 1308 | extern int pthread_setspecific (pthread_key_t __key,
+--- a/dist/aclocal/tls.m4
++++ b/dist/aclocal/tls.m4
+@@ -42,10 +42,10 @@ AC_DEFUN([AX_TLS], [
+ pthread_key_create(&key, NULL);
+ }
+ static void *get_tls() {
+- return (void *)pthread_getspecific(&key);
++ return (void *)pthread_getspecific(key);
+ }
+ static void set_tls(void *p) {
+- pthread_setspecific(&key, p);
++ pthread_setspecific(key, p);
+ }], [],
+ [ac_cv_tls=pthread])
+ fi
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/db/-/commit/b452cba5fe274af64ffa2af0626f48445aacc95a
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/db/-/commit/b452cba5fe274af64ffa2af0626f48445aacc95a
You're receiving this email because of your account on gitlab.archlinux.org.
