From 703f241c56199148e0acb3220c3f4a658ab24144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Fri, 10 Apr 2020 16:31:58 +0100 Subject: Pass pkg-config(1) search path via ${PKG_CONFIG_LIBDIR}. --- etc/README.md | 2 +- groups/100.native_tools.group | 2 +- groups/200.native_packages.group | 2 +- groups/251.native_packages_lib.group | 5 +++-- groups/800.minipix.group | 2 +- groups/dev_packages.group | 2 +- midipix.env | 6 +++--- subr/pkg_build.subr | 2 +- subr/pkg_configure.subr | 4 ++-- subr/pkg_configure_autotools.subr | 4 ++-- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/etc/README.md b/etc/README.md index 149a55b4..12c19ab7 100644 --- a/etc/README.md +++ b/etc/README.md @@ -525,7 +525,7 @@ VERSION`` and/or ``URLS_GIT``, respectively. | NO_LOG_VARS | Inhibit logging of build & package variables pre-package build | | PATCHES_EXTRA | Additional list of patches to apply | | PKG_CONFIG | Command- or pathname of ``pkg-config(1)`` | -| PKG_CONFIG_PATH | ``pkg-config(1)`` search path | +| PKG_CONFIG_LIBDIR | ``pkg-config(1)`` search directory | | PKGLIST_DISABLE | Inhibit inclusion into ``${PREFIX}/pkglist.${PKG_BUILD_TYPE}`` | | PREFIX | Absolute pathname of top-level installation directory and package search path | | PYTHON | Command- or pathname of Python | diff --git a/groups/100.native_tools.group b/groups/100.native_tools.group index 8dfc9a2a..30ac1cc3 100644 --- a/groups/100.native_tools.group +++ b/groups/100.native_tools.group @@ -6,7 +6,7 @@ NATIVE_TOOLS_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools"; NATIVE_TOOLS_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_TOOLS_PACKAGES=" mdso perk pkgconf slibtool"; -NATIVE_TOOLS_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig"; +NATIVE_TOOLS_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix= --target=${DEFAULT_TARGET}"}; diff --git a/groups/200.native_packages.group b/groups/200.native_packages.group index 1f677d52..886fab53 100644 --- a/groups/200.native_packages.group +++ b/groups/200.native_packages.group @@ -9,7 +9,7 @@ NATIVE_PACKAGES_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_PACKAGES=""; -NATIVE_PACKAGES_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig"; +NATIVE_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2"; diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index ac86b9c2..6eb33246 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -14,10 +14,11 @@ libxslt libz libzip")"; : ${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 --with-python=${PREFIX}/bin/python3"}; -: ${PKG_LIBARCHIVE_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e}; -: ${PKG_LIBARCHIVE_VERSION:=3.3.3}; +: ${PKG_LIBARCHIVE_SHA256SUM:=b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176}; +: ${PKG_LIBARCHIVE_VERSION:=3.4.2}; : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz}; : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib}; +: ${PKG_LIBARCHIVE_LIBTOOL:="libtool"}; : ${PKG_LIBASR_SHA256SUM:=9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d}; : ${PKG_LIBASR_VERSION:=1.0.3}; : ${PKG_LIBASR_URL:=https://www.opensmtpd.org/archives/libasr-${PKG_LIBASR_VERSION}.tar.gz}; diff --git a/groups/800.minipix.group b/groups/800.minipix.group index 8600c01d..ac2c59e2 100644 --- a/groups/800.minipix.group +++ b/groups/800.minipix.group @@ -16,7 +16,7 @@ gdb_minipix grep_minipix gzip_minipix infounzip_minipix infozip_minipix less_minipix nano_minipix patch_minipix python2_minipix sed_minipix tar_minipix vim_minipix wget_minipix which_minipix xz_minipix mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix"; -MINIPIX_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig"; +MINIPIX_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; MINIPIX_PKGLIST_DISABLE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; MINIPIX_RPM_DISABLE=1; diff --git a/groups/dev_packages.group b/groups/dev_packages.group index 83c20977..4446a7f3 100644 --- a/groups/dev_packages.group +++ b/groups/dev_packages.group @@ -11,7 +11,7 @@ DEV_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix="; DEV_PACKAGES_PACKAGES=" ncurses ncursesw coreutils bash libz git make sed grep findutils m4 flex bison diffutils patch patchutils gzip tar dos2unix nano vim"; -DEV_PACKAGES_PKG_CONFIG_PATH="${PREFIX_NATIVE}/lib/pkgconfig"; +DEV_PACKAGES_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; DEV_PACKAGES_PREFIX="${PREFIX_NATIVE}"; DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2"; : ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17}; diff --git a/midipix.env b/midipix.env index 3dfaec74..8435428c 100644 --- a/midipix.env +++ b/midipix.env @@ -26,7 +26,7 @@ DEFAULT_BUILD_VARS=" LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL \ MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ - PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE \ + PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE \ PREFIX RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URLS_GIT \ VERSION"; @@ -132,7 +132,7 @@ DEFAULT_BUILD_VARS=" : ${DEFAULT_HOST_LIBTOOL:=slibtool}; : ${DEFAULT_HOST_MAKE:=make LIBTOOL=slibtool}; : ${DEFAULT_HOST_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config}; -: ${DEFAULT_HOST_PKG_CONFIG_PATH:=${PREFIX}/lib/pkgconfig}; +: ${DEFAULT_HOST_PKG_CONFIG_LIBDIR:=${PREFIX}/lib/pkgconfig}; : ${DEFAULT_HOST_RANLIB:=ranlib}; : ${DEFAULT_NATIVE_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc}; @@ -140,7 +140,7 @@ DEFAULT_BUILD_VARS=" : ${DEFAULT_NATIVE_LIBTOOL:=slibtool}; : ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=slibtool}; : ${DEFAULT_NATIVE_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config}; -: ${DEFAULT_NATIVE_PKG_CONFIG_PATH:=${PREFIX}/lib/pkgconfig}; +: ${DEFAULT_NATIVE_PKG_CONFIG_LIBDIR:=${PREFIX}/lib/pkgconfig}; : ${DEFAULT_NATIVE_RANLIB:=${DEFAULT_TARGET}-ranlib}; # Build {log,status} & tarball names diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index d1808213..eeb6ae54 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -28,7 +28,7 @@ pkg_build() { "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}" \ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \ - "${PKG_PKG_CONFIG_PATH:+PKG_CONFIG_PATH=${PKG_PKG_CONFIG_PATH}}" \ + "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \ ${_libtool:+"LIBTOOL=${_libtool}"}; }; diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index f2b64f92..39f5dbf0 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -7,7 +7,7 @@ pkg_configure() { if [ -x "${PKG_CONFIGURE:-}" ]; then rtl_export_vars \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ - PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}" \ + PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ PYTHON "${PKG_PYTHON:-}"; AR="${PKG_AR}" \ CC="${PKG_CC}" \ @@ -20,7 +20,7 @@ pkg_configure() { _rc="${?}" rtl_export_vars -u \ PKG_CONFIG "${PKG_PKG_CONFIG:-}" \ - PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}" \ + PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}" \ PYTHON "${PKG_PYTHON:-}"; return "${_rc}"; fi; diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 86a9dd39..c09f27a4 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -6,7 +6,7 @@ pkg_configure_autotools() { local _config_cache="" _fname="" _subdir_tgt=""; if rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}" \ "config.guess" "configure.ac" "configure.in" "configure"; - then rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}"; + then rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; if [ "${PKG_FORCE_AUTORECONF:-0}" -eq 1 ]\ && ! (cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoreconf -fiv); then return 1; @@ -64,7 +64,7 @@ pkg_configure_autotools() { fi; fi; fi; - rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH:-}"; + rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"; fi; }; -- cgit v1.2.3