summaryrefslogtreecommitdiffstats
path: root/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
diff options
context:
space:
mode:
authorAdrien Nader <adrien@notk.org>2017-12-04 00:40:10 +0100
committerAdrien Nader <adrien@notk.org>2017-12-04 00:40:10 +0100
commit5d42464a8ebe8a58962a1e7a9aeacec270e85c64 (patch)
tree51d59af87cecc3959a975e392d916ed93da8c4c3 /slackware64-current/source/ap/mariadb/mariadb.SlackBuild
parent48fd9d588085b85d458ec94cfa683eabfb5f51d2 (diff)
Sun Dec 3 22:42:47 UTC 2017
a/btrfs-progs-v4.14-x86_64-1.txz: Upgraded. a/logrotate-3.13.0-x86_64-1.txz: Upgraded. a/pciutils-3.5.6-x86_64-1.txz: Upgraded. a/reiserfsprogs-3.6.27-x86_64-1.txz: Upgraded. a/xfsprogs-4.14.0-x86_64-1.txz: Upgraded. ap/itstool-2.0.4-x86_64-1.txz: Upgraded. ap/mariadb-10.2.11-x86_64-2.txz: Rebuilt. Removed a Darwin-only symbol from the TOKUDB_OK cmake test to fix TokuDB. ap/mpg123-1.25.8-x86_64-1.txz: Upgraded. ap/xfsdump-3.1.8-x86_64-1.txz: Upgraded. d/nasm-2.13.02-x86_64-1.txz: Upgraded. l/M2Crypto-0.27.0-x86_64-1.txz: Upgraded. l/babl-0.1.38-x86_64-1.txz: Upgraded. l/python-six-1.11.0-x86_64-1.txz: Upgraded. l/shared-mime-info-1.9-x86_64-1.txz: Upgraded. n/autofs-5.1.3-x86_64-1.txz: Upgraded. n/getmail-5.4-x86_64-1.txz: Upgraded. n/sshfs-2.10-x86_64-1.txz: Upgraded. n/traceroute-2.1.0-x86_64-1.txz: Upgraded. xfce/xfce4-terminal-0.8.6-x86_64-2.txz: Rebuilt. Applied upstream patch to add utempter support. Thanks to Robby Workman.
Diffstat (limited to 'slackware64-current/source/ap/mariadb/mariadb.SlackBuild')
-rwxr-xr-xslackware64-current/source/ap/mariadb/mariadb.SlackBuild12
1 files changed, 7 insertions, 5 deletions
diff --git a/slackware64-current/source/ap/mariadb/mariadb.SlackBuild b/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
index 0b4bbf149..4d2eb30b4 100755
--- a/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
+++ b/slackware64-current/source/ap/mariadb/mariadb.SlackBuild
@@ -28,7 +28,7 @@
PKGNAM=mariadb
VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# To reduce the package size, the embedded server may be omitted. Currently
# only amarok uses this. To build without embedded support, set this to NO.
@@ -64,12 +64,10 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i586" ]; then
- # Getting a GCC related failure on x86, so use -fpermissive for now:
- SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fpermissive"
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- # Getting a GCC related failure on x86, so use -fpermissive for now:
- SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fpermissive"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
@@ -83,6 +81,10 @@ rm -rf ${PKGNAM}-$VERSION
tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
cd ${PKGNAM}-$VERSION || exit 1
+# Revert TOKUDB_OK test commit that required a define that's only available
+# on a Darwin/MacOS system:
+zcat $CWD/mariadb-10.2.11.dont.require.darwin.symbol.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \