diff options
Diffstat (limited to 'source/l')
| -rw-r--r-- | source/l/FTBFSlog | 5 | ||||
| -rw-r--r-- | source/l/db48/db.rename.atomic_compare_exchange.diff | 20 | ||||
| -rwxr-xr-x | source/l/db48/db48.SlackBuild | 5 | ||||
| -rwxr-xr-x | source/l/glibc/glibc.SlackBuild | 8 | ||||
| -rwxr-xr-x | source/l/libodfgen/libodfgen.SlackBuild | 2 |
5 files changed, 38 insertions, 2 deletions
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index f18c27b50..a256e66d4 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,8 @@ +Tue Jun 26 09:10:33 UTC 2018 + db48: Fix symbol collision in atomic.h with gcc8 + glibc: fix FTBFS with gcc8 by adding --disable-werror + libodfgen: fix FTBFS with gcc8 by adding --disable-werror ++--------------------------+ Mon Apr 9 17:01:51 UTC 2018 db48: patch docs install out of Makefile, as it's causing a build failure and they would just be deleted before packaging anyway. 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 diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 0623cd5ce..acaadbeae 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -54,6 +54,13 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# Work around -Werror failure with gcc8: +if gcc --version | grep -wq 8.1.1 ; then + if [ "$VERSION" = "2.27" ]; then + WERROR="--disable-werror" + fi +fi + # I'll break this out as an option for fun :-) case $ARCH in i386) @@ -226,6 +233,7 @@ CFLAGS="-g $OPTIMIZ" \ --enable-obsolete-rpc \ --enable-profile \ $DISABLE_NSCD \ + $WERROR \ --infodir=/usr/info \ --mandir=/usr/man \ --with-tls \ diff --git a/source/l/libodfgen/libodfgen.SlackBuild b/source/l/libodfgen/libodfgen.SlackBuild index 2ff89c721..24333dab9 100755 --- a/source/l/libodfgen/libodfgen.SlackBuild +++ b/source/l/libodfgen/libodfgen.SlackBuild @@ -96,7 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ - --disable-tests \ + --disable-werror \ --build=$TARGET || exit 1 make $NUMJOBS || make || exit 1 |