diff options
Diffstat (limited to 'source/l/db48')
| -rw-r--r-- | source/l/db48/db.rename.atomic_compare_exchange.diff | 20 | ||||
| -rwxr-xr-x | source/l/db48/db48.SlackBuild | 5 |
2 files changed, 24 insertions, 1 deletions
diff --git a/source/l/db48/db.rename.atomic_compare_exchange.diff b/source/l/db48/db.rename.atomic_compare_exchange.diff new file mode 100644 index 000000000..36647c7d3 --- /dev/null +++ b/source/l/db48/db.rename.atomic_compare_exchange.diff @@ -0,0 +1,20 @@ +--- ./dbinc/atomic.h.orig 2010-04-12 15:25:22.000000000 -0500 ++++ ./dbinc/atomic.h 2018-06-26 04:32:46.092853113 -0500 +@@ -144,7 +144,7 @@ + #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 @@ + * 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; diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild index 3b3ce45ae..4d3060233 100755 --- a/source/l/db48/db48.SlackBuild +++ b/source/l/db48/db48.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=db48 VERSION=4.8.30 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:--j7} @@ -77,6 +77,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix symbol collision with gcc8: +zcat $CWD/db.rename.atomic_compare_exchange.diff.gz | patch -p1 --verbose || exit 1 + # We aren't installing the docs anyway so let's not let them break the build: zcat $CWD/db48.no.broken.doc.install.diff.gz | patch -p1 --verbose || exit 1 |