summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2017-03-08 14:40:50 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2017-03-08 14:40:50 +0000
commitf27e6c73690f3dd3f560f8e1b3acc21769b26a53 (patch)
treed7954a543609d0f18e2284c7fcf6ac6a954f181c
parent4cb0c0441face4f315c2b0b0998d96f0cf5a0b67 (diff)
downloadmidipix_build-f27e6c73690f3dd3f560f8e1b3acc21769b26a53.tar.bz2
midipix_build-f27e6c73690f3dd3f560f8e1b3acc21769b26a53.tar.xz
vars/build.vars: fixes mtr.
subr/pkg_autoconf.subr: include `bootstrap.sh' in the list of pre-autoconf scripts to run. patches/mtr.midipix.patch: fix incorrect name.
-rw-r--r--patches/mtr.git.local.patch (renamed from patches/mtr.midipix.patch)0
-rw-r--r--subr/pkg_autoconf.subr2
-rw-r--r--vars/build.vars4
3 files changed, 3 insertions, 3 deletions
diff --git a/patches/mtr.midipix.patch b/patches/mtr.git.local.patch
index a5ab92b1..a5ab92b1 100644
--- a/patches/mtr.midipix.patch
+++ b/patches/mtr.git.local.patch
diff --git a/subr/pkg_autoconf.subr b/subr/pkg_autoconf.subr
index e8bf0572..6ceec26b 100644
--- a/subr/pkg_autoconf.subr
+++ b/subr/pkg_autoconf.subr
@@ -15,7 +15,7 @@ pkg_autoconf() {
-exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;;
if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\
&& [ ! -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]; then
- for __ in bootstrap autogen.sh ""; do
+ for __ in bootstrap bootstrap.sh autogen.sh ""; do
if [ -z "${__}" ]; then
(build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && autoconf)\
|| exit 1 && break;
diff --git a/vars/build.vars b/vars/build.vars
index ee302814..e3efb49f 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -702,8 +702,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_MKSH_NO_MAKE_INSTALL:=1};
: ${PKG_MKSH_SUBDIR:=${PKG_MKSH_BUILD_DIR}};
: ${PKG_MTR_URLS_GIT:="mtr.git=https://github.com/traviscross/mtr.git@master"};
-: ${PKG_MTR_BUILD_DIR:="mtr.git"};
-: ${PKG_MTR_DISABLED:=1};
+: ${PKG_MTR_BUILD_DIR:=mtr.git};
+: ${PKG_MTR_SUBDIR:=${PKG_MTR_BUILD_DIR}};
: ${PKG_NANO_SHA256SUM:=b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee};
: ${PKG_NANO_VERSION:=2.5.3};
: ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz};