summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-02-07 21:56:19 +0100
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-02-07 21:56:19 +0100
commit1d38417dedd13ba85075878cc6faaa217adeb865 (patch)
tree79acbbeb939ebffe2c87a0ba377a133d0a5bf761
parentce7607c38e89fa56303cdf5d3aef7559cc1e0378 (diff)
downloadmidipix_build-1d38417dedd13ba85075878cc6faaa217adeb865.tar.bz2
midipix_build-1d38417dedd13ba85075878cc6faaa217adeb865.tar.xz
Followup to last commit.
-rw-r--r--build.subr4
-rw-r--r--build.vars4
-rw-r--r--pkg.build4
3 files changed, 7 insertions, 5 deletions
diff --git a/build.subr b/build.subr
index 82e73b32..e8d0a9f7 100644
--- a/build.subr
+++ b/build.subr
@@ -99,10 +99,10 @@ parse_with_pkg_name() {
_pkg_NAME=$(echo "${PKG_NAME}" | tr a-z A-Z);
for _vname in \
build_type configure_args configure_extra_args \
- no_config_cache no_libtool_midipix \
+ no_config_cache no_destdir no_libtool_midipix \
patches_extra prefix prefix_extra sha256sum \
url version \
- CC CFLAGS DESTDIR LDFLAGS; do
+ CC CFLAGS LDFLAGS; do
_vNAME=$(echo "${_vname}" | tr a-z A-Z);
if [ -n "${_vval:=$(eval echo \${PKG_${_pkg_NAME}_${_vNAME}})}" ]; then
export PKG_${_vNAME}="${_vval}";
diff --git a/build.vars b/build.vars
index faf98ff9..f4f0bd9f 100644
--- a/build.vars
+++ b/build.vars
@@ -39,7 +39,7 @@ TIMESTAMP_FMT="%Y/%m/%d %H:%M:%S";
: ${PKG_BINUTILS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2};
: ${PKG_BINUTILS_HOST_BUILD_TYPE:=cross};
: ${PKG_BINUTILS_HOST_CONFIGURE_ARGS:=--disable-werror --prefix=${PREFIX} --with-sysroot=${PREFIX_TARGET}};
-: ${PKG_BINUTILS_HOST_DESTDIR:=};
+: ${PKG_BINUTILS_HOST_NO_DESTDIR:=1};
: ${PKG_BINUTILS_HOST_NO_CONFIG_CACHE:=1};
: ${PKG_BINUTILS_HOST_NO_LIBTOOL_MIDIPIX:=1};
: ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
@@ -74,7 +74,7 @@ TIMESTAMP_FMT="%Y/%m/%d %H:%M:%S";
: ${PKG_GZIP_VERSION:=1.2.4};
: ${PKG_GZIP_URL:=https://ftp.gnu.org/gnu/gzip/gzip-${PKG_GZIP_VERSION}.tar.gz};
: ${PKG_LIBELF_CC:=${HOST_NATIVE}-gcc};
-: ${PKG_LIBELF_DESTDIR:=};
+: ${PKG_LIBELF_NO_DESTDIR:=1};
: ${PKG_LIBELF_NO_LIBTOOL_MIDIPIX:=1};
: ${PKG_LIBELF_PREFIX:=${PREFIX_NATIVE}};
: ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
diff --git a/pkg.build b/pkg.build
index 2624096a..e32c531f 100644
--- a/pkg.build
+++ b/pkg.build
@@ -12,7 +12,9 @@ else
else
_configure_args=${PKG_CONFIGURE_ARGS:--C --host=${HOST_NATIVE} --prefix=};
fi;
- : ${DESTDIR:=${PREFIX_NATIVE}};
+ if [ ${PKG_NO_DESTDIR:-0} -eq 0 ]; then
+ : ${DESTDIR:=${PREFIX_NATIVE}};
+ fi;
set_build_dir ${PKG_SUBDIR} ${PKG_BUILD_TYPE:-native};
fi;
if ! is_build_script_done extracted; then