db: fix gcc8 build

This commit is contained in:
Fredrik Rinnestam 2019-01-16 01:28:41 +01:00
parent 4815599bf9
commit 1d1d0d18ce
3 changed files with 55 additions and 5 deletions

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/core.pub
RWRJc1FUaeVeqinJMq0kJkDWOs3s+UrcXVJm76khhvj1V7pe5UhoHL2K3mlBSJ3T+uzCZ5iwx9qgQQxFv+N16ztpz4dn01JlOw0=
SHA256 (Pkgfile) = d596c5f1ffccab08cbbceaae819b536dacc80a9fcadbcfc94a69dd2ba2907bb1
RWRJc1FUaeVeqqI40v3L9iavReKUYQYWk2zTWj9/n/pBRBhTgVlkefq79eiQRHPmF1Oklimzkfgz0b40fEIGWuzQiE1U4RaObws=
SHA256 (Pkgfile) = 676569b36aae5b5ca3fb904169acff8f5db2af95e3b4b148e9041a401c9f32db
SHA256 (.footprint) = 3a4d0e8a4f718b7d171558a53799371c27bdcacf7991ef39b5c82e16d51b0f02
SHA256 (db-5.3.28.tar.gz) = e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628
SHA256 (0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch) = 696ac5af5473f0d85ecc6af44a85333c91500721fb5c33028c05e843429058d1

View File

@ -0,0 +1,45 @@
From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 22 Mar 2017 15:32:26 +0000
Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash
with builtins
Helps building with clang
Fixes
../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange'
static inline int __atomic_compare_exchange(
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/dbinc/atomic.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
index 6a858f7..1b49de5 100644
--- a/src/dbinc/atomic.h
+++ b/src/dbinc/atomic.h
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
#define atomic_inc(env, p) __atomic_inc(p)
#define atomic_dec(env, p) __atomic_dec(p)
#define atomic_compare_exchange(env, p, o, n) \
- __atomic_compare_exchange((p), (o), (n))
+ __db_atomic_compare_exchange((p), (o), (n))
static inline int __atomic_inc(db_atomic_t *p)
{
int temp;
@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
* http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
* which configure could be changed to use.
*/
-static inline int __atomic_compare_exchange(
+static inline int __db_atomic_compare_exchange(
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
{
atomic_value_t was;
--
1.8.3.1

View File

@ -4,11 +4,15 @@
name=db
version=5.3.28
release=1
source=(http://download.oracle.com/berkeley-db/$name-$version.tar.gz)
release=2
source=(http://download.oracle.com/berkeley-db/$name-$version.tar.gz \
0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch)
build() {
cd $name-$version/build_unix
cd $name-$version
patch -p1 -i $SRC/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
cd build_unix
../dist/configure --prefix=/usr \
--enable-compat185 \
--enable-shared \