From 63f56cc135f65b25d924c16f959a8819e55740d9 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 27 Jun 2018 04:13:25 +0000 Subject: Wed Jun 27 04:13:25 UTC 2018 a/kernel-generic-4.14.52-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.52-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.52-x86_64-1.txz: Upgraded. ap/sox-14.4.2-x86_64-6.txz: Rebuilt. Rebuilt to drop libssp dependency. We're no longer building that with gcc since glibc already includes a built-in SSP implementation. d/gcc-8.1.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. This is taken from the gcc-8-branch of the svn repo on 20180626, revision r262159. All packages have been tested for build failures and all new FTBFS issues are fixed - I think we're down to the six possibly obsolete X drivers (geode, r128, s3virge, savage, sis, and tseng) and virtuoso-ose. d/gcc-brig-8.1.1-x86_64-1.txz: Upgraded. d/gcc-g++-8.1.1-x86_64-1.txz: Upgraded. d/gcc-gfortran-8.1.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/gcc-gnat-8.1.1-x86_64-1.txz: Upgraded. d/gcc-go-8.1.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/gcc-objc-8.1.1-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.52-x86-1.txz: Upgraded. d/libtool-2.4.6-x86_64-8.txz: Rebuilt. Recompiled to update embedded GCC version number. k/kernel-source-4.14.52-noarch-1.txz: Upgraded. l/db48-4.8.30-x86_64-4.txz: Rebuilt. Patched to fix a symbol collision with gcc8. n/netatalk-3.1.11-x86_64-1.txz: Upgraded. Thanks to Matthew Schumacher for updating the build script and providing some useful config file examples. extra/pure-alsa-system/sox-14.4.2-x86_64-6_alsa.txz: Rebuilt. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/l/db48/db.rename.atomic_compare_exchange.diff | 20 ++++++++++++++++++++ source/l/db48/db48.SlackBuild | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 source/l/db48/db.rename.atomic_compare_exchange.diff (limited to 'source/l/db48') 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 -- cgit v1.2.3