summaryrefslogtreecommitdiffhomepage
path: root/build.vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-06-24 09:08:32 +0200
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-06-24 09:12:07 +0200
commit183e568ab8b6d6a50d67a486c357d2c335a30418 (patch)
tree2fbe58b3545506cd1dec1d5ce3d43fed12307c12 /build.vars
parent5369d56b11edf94549e3230b0a731fd245b30417 (diff)
downloadmidipix_build-183e568ab8b6d6a50d67a486c357d2c335a30418.tar.bz2
midipix_build-183e568ab8b6d6a50d67a486c357d2c335a30418.tar.xz
Fixes libarchive v3.1.2 (via Somasis) and Python v3.5.1 build failures.
- Adds nl(1) to ${CHECK_PREREQ_CMDS}. - Adds `Exherbo Linux (x86_64-pc-linux-musl) (x86_64)' to TESTED_ON and build.usage. - Build libarchive w/ --without-expat --without-xml2. - Install Python w/ prefix=. - Make libarchive use slibtool even when installing and remove the libtool-related patch and ${PKG_LIBARCHIVE_LIBTOOL_MIDIPIX}.
Diffstat (limited to 'build.vars')
-rw-r--r--build.vars6
1 files changed, 4 insertions, 2 deletions
diff --git a/build.vars b/build.vars
index c58de908..c265cb48 100644
--- a/build.vars
+++ b/build.vars
@@ -14,7 +14,7 @@
: ${BUILD_STATUS_FINISHED_AT_CURRENT_FNAME:=${PREFIX}/BUILD_FINISHED_AT};
: ${BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS};
: ${CFLAGS_DEFAULT:=-g2 -O0};
-: ${CHECK_PREREQ_CMDS:="aclocal autoconf autopoint bunzip2 flex git gunzip install libtool make makeinfo mktemp openssl patch sed sort tar tee tr sha256sum wget xz"};
+: ${CHECK_PREREQ_CMDS:="aclocal autoconf autopoint bunzip2 flex git gunzip install libtool make makeinfo mktemp nl openssl patch sed sort tar tee tr sha256sum wget xz"};
: ${CHECK_PREREQ_FILES:="/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"};
: ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE WORKDIR"};
: ${CLEAR_ENV_VARS_EXCEPT:="HOME PATH SHELL TERM USER"};
@@ -188,10 +188,11 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
: ${PKG_LIBARCHIVE_VERSION:=3.1.2};
: ${PKG_LIBARCHIVE_SHA256SUM:=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e};
: ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
+: ${PKG_LIBARCHIVE_CONFIGURE_ARGS_EXTRA:=--without-xml2};
: ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_LVL3}/lib};
: ${PKG_LIBARCHIVE_LIBFILES_FIX:=1};
-: ${PKG_LIBARCHIVE_LIBTOOL_MIDIPIX:=1};
: ${PKG_LIBARCHIVE_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_LIBARCHIVE_MAKEFLAGS_INSTALL_EXTRA:="prefix=:DESTDIR=${PREFIX_LVL3}:LIBTOOL=slibtool"};
: ${PKG_LIBELF_VERSION:=0.8.13};
: ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
: ${PKG_LIBELF_URL:=http://www.mr511.de/software/libelf-${PKG_LIBELF_VERSION}.tar.gz};
@@ -328,6 +329,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
: ${PKG_PYTHON3_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz};
: ${PKG_PYTHON3_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${HOST_NATIVE} --prefix=${PREFIX_LVL3} --without-ensurepip"};
: ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${HOST_NATIVE}-gcc -shared -mout-implib --sysroot=${PREFIX_LVL3}:CC=${HOST_NATIVE}-gcc:CFLAGS=--sysroot=${PREFIX_LVL3}:CPPFLAGS=--sysroot=${PREFIX_LVL3}:LDFLAGS=-L${PREFIX_LVL3}/lib"}:
+: ${PKG_PYTHON3_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
: ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}};
: ${PKG_RSYNC_VERSION:=3.1.2};
: ${PKG_RSYNC_SHA256SUM:=ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2};