From 1daa6ba6b88f7cb5eb37a6d62ff56b4511d89412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 16 Jun 2019 16:57:55 +0000
Subject: vars/build.vars:info{,un}zip:${PKG_CFLAGS_BUILD_EXTRA}: inherit from
 ${NATIVE_PACKAGES_CFLAGS_CONFIGURE}.
 patches/info{,un}zip{,_minipix}.local.patch: correctly inherit $(CFLAGS) &
 pass $(LDFLAGS).

---
 vars/build.vars | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'vars/build.vars')

diff --git a/vars/build.vars b/vars/build.vars
index ae9c5f7e..297424fe 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1011,6 +1011,17 @@ diffutils patch patchutils gzip tar dos2unix nano vim";
 DEV_PACKAGES_PREFIX="${NATIVE_PACKAGES_DEPS_PREFIX}";
 DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 
+#
+# Build target native_packages
+#
+NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
+NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_PARALLELISE=1;
+NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
+NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
+
 #
 # Packages list native_packages_cmdline
 NATIVE_PACKAGES_CMDLINE_PACKAGES="
@@ -1333,8 +1344,10 @@ tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd";
 : ${PKG_ISYNC_CONFIGURE_ARGS_EXTRA:=--disable-compat};
 : ${PKG_INFOUNZIP_URLS_GIT:=infounzip=https://github.com/Redfoxmoon3/infounzip.git@master};
 : ${PKG_INFOUNZIP_IN_TREE:=1};
+: ${PKG_INFOUNZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${PKG_INFOZIP_IN_TREE:=1};
+: ${PKG_INFOZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_JAMVM_SHA256SUM:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da};
 : ${PKG_JAMVM_VERSION:=2.0.0};
 : ${PKG_JAMVM_URL:=http://sourceforge.mirrorservice.org/j/ja/jamvm/jamvm/JamVM%20${PKG_JAMVM_VERSION}/jamvm-${PKG_JAMVM_VERSION}.tar.gz};
@@ -1596,21 +1609,11 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht
 : ${PKG_WHOIS_MAKE_INSTALL_VNAME:=BASEDIR};
 : ${PKG_WHOIS_SUBDIR:=whois-${PKG_WHOIS_VERSION}};
 
-#
-# Build target native_packages
-#
-NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_PACKAGES="
 ${NATIVE_PACKAGES_CMDLINE_PACKAGES}
 ${NATIVE_PACKAGES_DEV_PACKAGES}
 ${NATIVE_PACKAGES_ETC_PACKAGES}
 ${NATIVE_PACKAGES_INET_PACKAGES}";
-NATIVE_PACKAGES_PARALLELISE=1;
-NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
-NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 
 #
 # Build target minipix
-- 
cgit v1.2.3