diff options
-rw-r--r-- | TESTED_ON | 1 | ||||
-rw-r--r-- | build.usage | 1 | ||||
-rw-r--r-- | build.vars | 6 | ||||
-rw-r--r-- | libarchive-3.1.2.local.patch | 18 |
4 files changed, 6 insertions, 20 deletions
@@ -1,4 +1,5 @@ Arch Linux 2016.02.01 (x86_64) CentOS v7.2.1511 (Core) (x86_64) Debian GNU/Linux v8.5 (stable) (jessie) (x86_64) +Exherbo Linux (x86_64-pc-linux-musl) (x86_64) openSUSE 20150612 (Tumbleweed) (x86_64) diff --git a/build.usage b/build.usage index f6b2d76e..b19d4a9e 100644 --- a/build.usage +++ b/build.usage @@ -47,4 +47,5 @@ This script has been tested on the following platforms: Arch Linux 2016.02.01 (x86_64) CentOS v7.2.1511 (Core) (x86_64) Debian GNU/Linux v8.5 (stable) (jessie) (x86_64) +Exherbo Linux (x86_64-pc-linux-musl) (x86_64) openSUSE 20150612 (Tumbleweed) (x86_64) @@ -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}; diff --git a/libarchive-3.1.2.local.patch b/libarchive-3.1.2.local.patch index 1c5aa846..8baaf3b6 100644 --- a/libarchive-3.1.2.local.patch +++ b/libarchive-3.1.2.local.patch @@ -20,24 +20,6 @@ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ---- libarchive-3.1.2/configure.orig 2013-02-09 18:23:08.000000000 +0100 -+++ libarchive-3.1.2/configure 2016-03-08 12:40:21.031444000 +0100 -@@ -21629,3 +21629,15 @@ - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - -+# a transitional workaround... -+case $host_os in -+ midipix*) -+ cp $ac_confdir/libtool.midipix libtool || exit 2 -+ -+ sed -i -e 's/@cbb_host_os@/'$host'/g' \ -+ -e 's/@cbb_build_alias@/'$build_alias'/g' \ -+ -e 's/@cbb_build_os@/'$build_os'/g' \ -+ -e 's/@cbb_build@/'$build'/g' libtool || exit 2 -+ ;; -+esac -+ --- libarchive-3.1.2/cpio/bsdcpio.1.orig +++ libarchive-3.1.2/cpio/bsdcpio.1 @@ -156,7 +156,8 @@ |