diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-06-11 15:32:13 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-06-11 15:32:13 +0000 |
| commit | 11ee19688cab2dbb01d09ce9dcb7ad0a1d16f417 (patch) | |
| tree | 91ec35c01b4a69724ce0d8c49d95c2eab282b137 | |
| parent | cc951a8895668371418d969ade2af4380e99c2b1 (diff) | |
| download | midipix_build-11ee19688cab2dbb01d09ce9dcb7ad0a1d16f417.tar.bz2 midipix_build-11ee19688cab2dbb01d09ce9dcb7ad0a1d16f417.tar.xz | |
Provide workaround for glib-2.46.2 build failure w/ slibtool by
forcing usage of libtool w/o the `make LIBTOOL=[ ... ]' hack.
Fixes related glib-2.46.2 32-bit build failure in <95162014754fca037510884f5a3c0c73988cd902>.
| -rw-r--r-- | build.vars | 3 | ||||
| -rw-r--r-- | pkg.build | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -155,7 +155,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:=--with-pcre=internal --disable-libelf}; : ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_LVL3}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX_LVL3}/lib -lffi}; : ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_LVL3}/lib}; -: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99 -j1}; +: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99}; +: ${PKG_GLIB_SLIBTOOL:=none}; : ${PKG_GMP_VERSION:=5.1.3}; : ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160}; : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2}; @@ -104,7 +104,9 @@ if ! is_build_script_done build; then if test_cmd pkg_${PKG_NAME}_build; then pkg_${PKG_NAME}_build; else - export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; + if [ "${PKG_SLIBTOOL}" != "none" ]; then + export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; + fi; run_cmd_unsplit make \ ${PKG_MAKEFLAGS_BUILD} \ ${PKG_MAKEFLAGS_BUILD_EXTRA} \ |