diff options
| -rw-r--r-- | subr/ex_pkg_env.subr | 7 | ||||
| -rw-r--r-- | vars/build.vars | 19 |
2 files changed, 9 insertions, 17 deletions
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index d3921e5f..853d785c 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -34,8 +34,11 @@ ex_pkg_env() { export CC="${PKG_TARGET}-gcc"; export CXX="${PKG_TARGET}-g++"; export RANLIB="${PKG_TARGET}-ranlib"; - [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]\ - && export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + if [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]; then + export PKGCONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + export PKG_CONFIG_LIBDIR="${PKG_PREFIX}/lib/pkgconfig"; + fi; ;; esac; export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; diff --git a/vars/build.vars b/vars/build.vars index 20921c31..4d069103 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -212,7 +212,7 @@ HOST_PACKAGES_PREFIX="${PREFIX}"; : ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz}; : ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=configure_patch:dynamic}; : ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"}; -: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-lffi}; +: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:="LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi"}; : ${PKG_GLIB_HOST_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX}/lib}; : ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master}; : ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master}; @@ -313,8 +313,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_GLIB_VERSION:=2.54.0}; : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz}; : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"}; -: ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_NATIVE}/lib/libffi-${PKG_LIBFFI_VERSION}/include:LIBFFI_LIBS=-lffi}; -: ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib}; : ${PKG_GZIP_SHA256SUM:=1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e}; : ${PKG_GZIP_VERSION:=1.8}; : ${PKG_GZIP_URL:=https://ftp.gnu.org/gnu/gzip/gzip-${PKG_GZIP_VERSION}.tar.gz}; @@ -529,8 +527,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_IMLIB2_CONFIGURE_ARGS_EXTRA:=--disable-mmx --disable-amd64}; : ${PKG_IMLIB2_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2}; : ${PKG_LIBCACA_URLS_GIT:=libcaca=https://github.com/cacalabs/libcaca@master}; -: ${PKG_LIBCACA_ENV_VARS_EXTRA:="IMLIB2_CFLAGS=-I${PREFIX_NATIVE}:IMLIB2_LIBS=-L${PREFIX_NATIVE}/lib -lImlib2"}; -: ${PKG_LIBCACA_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lImlib2"}; # # Build target dev_packages @@ -647,7 +643,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_GIT_VERSION:=2.14.1}; : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz}; : ${PKG_GIT_BUILD_DIR:=git-${PKG_GIT_VERSION}}; -: ${PKG_GIT_ENV_VARS_EXTRA:="ac_cv_fread_reads_directories=1:ac_cv_snprintf_returns_bogus=0"}; : ${PKG_GIT_SUBDIR:=${PKG_GIT_BUILD_DIR}}; : ${PKG_GNUPG_SHA256SUM:=49b9a6a6787ad00d4d2d69d8c7ee8905923782583f06078a064a0c80531d8844}; : ${PKG_GNUPG_VERSION:=2.1.16}; @@ -694,16 +689,14 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LIGHTTPD_SHA256SUM:=1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f}; : ${PKG_LIGHTTPD_VERSION:=1.4.45}; : ${PKG_LIGHTTPD_URL:=http://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz}; -: ${PKG_LIGHTTPD_ENV_VARS_EXTRA:="PCRECONFIG=${PREFIX_NATIVE}/bin/pcre-config"}; : ${PKG_FLEX_SHA256SUM:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995}; : ${PKG_FLEX_VERSION:=2.6.4}; : ${PKG_FLEX_URL:=https://github.com/westes/flex/releases/download/v${PKG_FLEX_VERSION}/flex-${PKG_FLEX_VERSION}.tar.gz}; : ${PKG_FLEX_CONFIGURE_ARGS_EXTRA:=--disable-libfl}; : ${PKG_LUNIX_URLS_GIT:=lunix=https://github.com/Redfoxmoon3/lunix.git@master}; : ${PKG_LUNIX_BUILD_DIR:=lunix}; -: ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3"}; -: ${PKG_LUNIX_MAKEFLAGS_INSTALL_EXTRA:=libdir=lib}; -: ${PKG_LUNIX_ENV_VARS_EXTRA:="libdir=${PREFIX_NATIVE}/lib"}; +: ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3 libdir=${PREFIX_NATIVE}/lib"}; +: ${PKG_LUNIX_MAKEFLAGS_INSTALL_EXTRA:="libdir=lib"}; : ${PKG_LYNX_SHA256SUM:=6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7}; : ${PKG_LYNX_VERSION:=2.8.8rel.2}; : ${PKG_LYNX_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/lynx/lynx${PKG_LYNX_VERSION}.tar.bz2}; @@ -853,16 +846,13 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_TMUX_VERSION:=2.3}; : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz}; : ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master}; -: ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}:CACA_LIBS=-lcaca"}; : ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"}; : ${PKG_UBASE_MAKE_INSTALL_VNAME:=PREFIX}; : ${PKG_UBASE_PREFIX:=${PREFIX_NATIVE}/suckless}; : ${PKG_UTIL_LINUX_SHA256SUM:=d5950e4b2839d00aa3781f439bfada8091bc6ed8180d8262c53b4e4304e2d299}; : ${PKG_UTIL_LINUX_VERSION:=2.31}; : ${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:="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}; @@ -874,9 +864,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WEECHAT_SHA256SUM:=3061e57460e0e3e4533551c45ced53b222fe0933848250d0fb7337d9aacfd853}; : ${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_CONFIGURE_ARGS_EXTRA:="--disable-aspell --disable-gnutls --disable-guile --disable-javascript --disable-lua --disable-perl --disable-python --disable-ruby --disable-tcl"}; : ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"}; -: ${PKG_WEECHAT_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib}; : ${PKG_WGET_SHA256SUM:=4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920}; : ${PKG_WGET_VERSION:=1.19.2}; : ${PKG_WGET_URL:=https://ftp.gnu.org/gnu/wget/wget-${PKG_WGET_VERSION}.tar.gz}; |