tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mariadb: fix armv6*; disable parallel build again

Browse Source 
Occasionally parallel builds still fail, thus disable_parallel_build=yes again.
This commit is contained in:
Jürgen Buchmüller 2018-01-21 16:09:59 +01:00
parent b0cb77d4e9
commit cfa06e29b9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcpkgs/mariadb/template
View File

@ -32,14 +32,25 @@ homepage="https://mariadb.org/"
license="GPL-2" license="GPL-2"
distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz" distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz"
checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88 checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88
disable_parallel_build=yes
CFLAGS="-w" CFLAGS="-w"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
armv6*) broken="https://build.voidlinux.eu/builders/armv6l_builder/builds/7456/steps/shell_3/logs/stdio";; armv6*) LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -latomic"
aarch64*) broken="https://github.com/voidlinux/void-packages/pull/10910";; hostmakedepends+=" libatomic-devel"
makedepends+=" libatomic-devel"
;;
aarch64*)
broken="https://github.com/voidlinux/void-packages/pull/10910"
;;
esac esac
pre_configure() { pre_configure() {
case "$XBPS_TARGET_MACHINE" in
armv6*) find -name CMakeLists.txt -exec sed -i "{}" \
-e "/TARGET_LINK_LIBRARIES/s;); atomic);" \;
;;
esac
# We need some host binaries before starting cross compilation. # We need some host binaries before starting cross compilation.
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# XXX still broken: jemalloc configure execs host bins. # XXX still broken: jemalloc configure execs host bins.