diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-10-12 10:01:27 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-10-12 10:01:27 +0000 |
| commit | 3ed50ab9a5ebe8d6f8972e45979bb279b6b88a53 (patch) | |
| tree | cd6f7afd4de3d29ccbb79a08337b8e3fb427b81e | |
| parent | 7e690e49bea3f10e14a937770666e751a5f06bc2 (diff) | |
| download | midipix_build-3ed50ab9a5ebe8d6f8972e45979bb279b6b88a53.tar.bz2 midipix_build-3ed50ab9a5ebe8d6f8972e45979bb279b6b88a53.tar.xz | |
subr/build_init.subr: don't set ${LD_LIBRARY_PATH}.
subr/ex_pkg_env.subr: don't unset ${LD_LIBRARY_PATH} given build target host_packages_deps.
vars/libsolv.vars: don't unset ${LD_LIBRARY_PATH}.
| -rw-r--r-- | subr/build_init.subr | 1 | ||||
| -rw-r--r-- | subr/ex_pkg_env.subr | 3 | ||||
| -rw-r--r-- | vars/libsolv.vars | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/subr/build_init.subr b/subr/build_init.subr index 3bd6af11..0634e33b 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -56,7 +56,6 @@ 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 ex_rtl_lmatch "${ARG_DIST}" , rpm; then ex_rtl_fileop mkdir "${PREFIX_RPM}"; diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index d818f4e1..bc4f9ce2 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -33,9 +33,6 @@ exp_pkg_env_source() { ex_rtl_unset_vars $(ex_rtl_lfilter_not \ "$(set | awk -F= '/^PKG_/{print $1}' | sort)" \ "${_vars_set}"); - if [ "${_tgt_name}" = "host_packages_deps" ]; then - unset LD_LIBRARY_PATH; - fi; }; ex_pkg_env() { diff --git a/vars/libsolv.vars b/vars/libsolv.vars index 0be3d9bd..90a50cf7 100644 --- a/vars/libsolv.vars +++ b/vars/libsolv.vars @@ -4,7 +4,6 @@ pkg_libsolv_configure() { rm -f config.cache; - unset LD_LIBRARY_PATH; env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ PREFIX="" \ cmake -DCMAKE_FIND_ROOT_PATH="${PKG_PREFIX}" \ @@ -35,4 +34,6 @@ pkg_libsolv_configure() { -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include" \ -DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a" \ "../libsolv-${PKG_VERSION}"; -} +}; + +# vim:filetype=sh |