From 1771c223bd34bed5e5919324ec888b2bf7c5acbc Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Nov 22 2017 12:12:13 +0000 Subject: vars/build.vars: remove redundant ${PKG_CONFIG} exports. --- diff --git a/vars/build.vars b/vars/build.vars index 764d071..630f85b 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -453,7 +453,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_FREETYPE_SHA256SUM:=a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b}; : ${PKG_FREETYPE_VERSION:=2.8}; : ${PKG_FREETYPE_URL:=http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_FREETYPE_VERSION}.tar.bz2}; -: ${PKG_FREETYPE_ENV_VARS_EXTRA:=PKG_CONFIG=${TARGET}-pkg-config}; : ${PKG_FONTCONFIG_SHA256SUM:=7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89}; : ${PKG_FONTCONFIG_VERSION:=2.11.95}; : ${PKG_FONTCONFIG_URL:=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_FONTCONFIG_VERSION}.tar.bz2}; @@ -563,7 +562,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2}; -: ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}:PKG_CONFIG=${TARGET}-pkg-config}; +: ${PKG_APK_TOOLS_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:CROSS_COMPILE=${TARGET}-:LUAAPK=:VERBOSE=1:PREFIX=${PREFIX_NATIVE}}; : ${PKG_APK_TOOLS_MAKEFLAGS_INSTALL_EXTRA:="PREFIX=${PREFIX_NATIVE} MANDIR=/share/man DOCDIR=/share/doc/apk"}; : ${PKG_ARIA2_SHA256SUM:=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50}; : ${PKG_ARIA2_VERSION:=1.32.0}; @@ -861,13 +860,12 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz}; : ${PKG_UTIL_LINUX_MAKEFLAGS_BUILD_EXTRA:="NCURSES_LIBS=-lncursesw"}; : ${PKG_UTIL_LINUX_CONFIGURE_ARGS_EXTRA:=--disable-agetty --disable-lslogins --disable-wall --disable-write}; -: ${PKG_UTIL_LINUX_ENV_VARS_EXTRA:="PKG_CONFIG=${PREFIX}/bin/${TARGET}-pkg-config:NCURSES_LIBS=-lncursesw"}; +: ${PKG_UTIL_LINUX_ENV_VARS_EXTRA:="NCURSES_LIBS=-lncursesw"}; : ${PKG_VIM_SHA256SUM:=8de19b12cabde17b87f915a05e1855f6ff8404962947c5cf2204cf51f1ce5d67}; : ${PKG_VIM_VERSION:=7.4.1952}; : ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz}; : ${PKG_VIM_BUILD_DIR:=vim-${PKG_VIM_VERSION}}; : ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw}; -: ${PKG_VIM_ENV_VARS_EXTRA:=PKG_CONFIG=${PREFIX}/bin/${TARGET}-pkg-config}; : ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi}; : ${PKG_VIM_MAKEFLAGS_INSTALL_EXTRA:=STRIP=/bin/true}; : ${PKG_VIM_SUBDIR:=${PKG_VIM_BUILD_DIR}}; @@ -875,7 +873,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WEECHAT_VERSION:=1.6}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-python --disable-python3 --disable-ruby --disable-tcl"}; -: ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:PKG_CONFIG=${PREFIX}/bin/${TARGET}-pkg-config"}; +: ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config"}; : ${PKG_WEECHAT_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib}; : ${PKG_WGET_SHA256SUM:=4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920}; : ${PKG_WGET_VERSION:=1.19.2}; @@ -887,7 +885,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WHOIS_SHA256SUM:=048c3b0fd731e5c777c9cf1e01e0ed7aca387891743a97c5b57b3daa8df524a4}; : ${PKG_WHOIS_VERSION:=5.2.18}; : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz}; -: ${PKG_WHOIS_ENV_VARS_EXTRA:=PKG_CONFIG=${TARGET}-pkg-config}; : ${PKG_WHOIS_MAKE_INSTALL_VNAME:=BASEDIR}; : ${PKG_WHOIS_SUBDIR:=whois-${PKG_WHOIS_VERSION}}; : ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521};