From e6f0f76f1621ffaa9a5f4a331efa2f2a99fb14a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Thu, 25 Feb 2016 15:14:45 +0000 Subject: Followup to 392fefdbc69503caa750277d378222cf4597b752 (fixes Git and $MAKEFLAGS.) --- build.vars | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.vars b/build.vars index 39750fbd..5614defb 100644 --- a/build.vars +++ b/build.vars @@ -35,19 +35,19 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL_MIDIPIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_TYPE VERSION"}; : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0}; : ${PKG_LVL0_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"}; -: ${PKG_LVL0_MAKEFLAGS_BUILD:=${MAKEFLAGS}}; +: ${PKG_LVL0_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}}; : ${PKG_LVL1_CFLAGS_CONFIGURE:=${CFLAGS_DEFAULT}}; : ${PKG_LVL1_CONFIGURE_ARGS:="--host=${HOST_NATIVE} --prefix=/ --target=${TARGET}"}; -: ${PKG_LVL1_MAKEFLAGS_BUILD:=${MAKEFLAGS}}; +: ${PKG_LVL1_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}}; : ${PKG_LVL1_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX_LVL1}}; : ${PKG_LVL2_BUILD_TYPE:=cross}; : ${PKG_LVL2_CFLAGS_CONFIGURE:=${CFLAGS_DEFAULT}}; : ${PKG_LVL2_CONFIGURE_ARGS:="--prefix=${PREFIX_LVL2} --host=${HOST_NATIVE}"}; : ${PKG_LVL2_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_LVL2}/include LDFLAGS_PATH=-L${PREFIX_LVL2}/lib"}; -: ${PKG_LVL2_MAKEFLAGS_BUILD:=${MAKEFLAGS}}; +: ${PKG_LVL2_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}}; : ${PKG_LVL2_URL_TYPE:=git}; : ${PKG_LVL3_CFLAGS_CONFIGURE:=${CFLAGS_DEFAULT}}; -: ${PKG_LVL3_MAKEFLAGS_BUILD:=${MAKEFLAGS}}; +: ${PKG_LVL3_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}}; : ${PKG_LVL3_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX_LVL3}}; : ${PKG_LVL3_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"}; @@ -110,7 +110,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_GIT_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_LVL3}/lib}; : ${PKG_GIT_LDFLAGS_INSTALL_EXTRA:=-L${PREFIX_LVL3}/lib}; : ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=NO_CURL=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99}; -: ${PKG_GIT_MAKEFLAGS_INSTALL_EXTRA:=NO_CURL=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99}; +: ${PKG_GIT_MAKEFLAGS_INSTALL:=NO_CURL=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99}; : ${PKG_GIT_RANLIB_INSTALL:=${HOST_NATIVE}-ranlib}; : ${PKG_GIT_SUBDIR:=git}; : ${PKG_GIT_URL:=https://github.com/git/git.git}; -- cgit v1.2.3