From 8613ec363c52688dce539f875fa54c8ed985ccf5 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?= <lucio@lucioillanes.de>
Date: Mon, 14 May 2018 19:26:13 +0000
Subject: subr/build_init.subr, vars/build.vars: move
 LD_LIBRARY_PATH+=${PREFIX}/bin export.

---
 subr/build_init.subr | 1 +
 vars/build.vars      | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/subr/build_init.subr b/subr/build_init.subr
index a6513f83..7683ccf0 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -54,6 +54,7 @@ build_init() {
 		fi;
 	done;
 	ex_rtl_unset_vars $(ex_rtl_lfilter_not "${_env_vars}" "${_env_vars_except}");
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${PREFIX}/lib";
 	ex_rtl_fileop mkdir "${BUILD_DLCACHEDIR}" "${BUILD_WORKDIR}";
 	if [ "${ARG_RPM:-0}" -eq 1 ]; then
 		ex_rtl_fileop mkdir "${PREFIX_RPM}";
diff --git a/vars/build.vars b/vars/build.vars
index 658d48a9..b4d3e12a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -320,7 +320,6 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 HOST_PACKAGES_DEPS_BUILD_TYPE="host";
 HOST_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST:+${DEFAULT_CFLAGS_HOST} }-I${PREFIX}/include";
 HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-prefix=";
-HOST_PACKAGES_DEPS_ENV_VARS_EXTRA="LD_LIBRARY_PATH=${PREFIX}/lib";
 HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib";
 HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_PACKAGES_DEPS_PACKAGES="
@@ -379,7 +378,6 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 #
 NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-NATIVE_PACKAGES_DEPS_ENV_VARS_EXTRA="LD_LIBRARY_PATH=${PREFIX}/lib";
 NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_PACKAGES="
@@ -625,7 +623,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 #
 NATIVE_PACKAGES_DEPS_X11_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-NATIVE_PACKAGES_DEPS_X11_ENV_VARS_EXTRA="LD_LIBRARY_PATH=${PREFIX}/lib";
 NATIVE_PACKAGES_DEPS_X11_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_X11_PACKAGES="
@@ -805,7 +802,6 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 #
 DEV_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 DEV_PACKAGES_CONFIGURE_ARGS="${NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS}";
-DEV_PACKAGES_ENV_VARS_EXTRA="LD_LIBRARY_PATH=${PREFIX}/lib";
 DEV_PACKAGES_LDFLAGS_CONFIGURE="${NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE}";
 DEV_PACKAGES_MAKEFLAGS_INSTALL="${NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL}";
 DEV_PACKAGES_PACKAGES="
-- 
cgit v1.2.3