diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-09 18:34:36 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-09 18:34:36 +0000 |
| commit | def55a0abe8c61b857c4bc021500bf52abd65a61 (patch) | |
| tree | fd6b334116c47bacfd663964f130a38e2e3a58b4 | |
| parent | babea71bdc83c61191a3d0c4d93d35de439c85d1 (diff) | |
| download | midipix_build-def55a0abe8c61b857c4bc021500bf52abd65a61.tar.bz2 midipix_build-def55a0abe8c61b857c4bc021500bf52abd65a61.tar.xz | |
patches/{libcaca,toilet}_pre.local.patch: use $PKG_CONFIG vs. pkg-config.
subr/pkg_configure_autotools.subr: export ${PKG_CONFIG{,_PATH}}.
| -rw-r--r-- | patches/libcaca_pre.local.patch | 11 | ||||
| -rw-r--r-- | patches/toilet_pre.local.patch | 11 | ||||
| -rw-r--r-- | subr/pkg_configure_autotools.subr | 7 |
3 files changed, 29 insertions, 0 deletions
diff --git a/patches/libcaca_pre.local.patch b/patches/libcaca_pre.local.patch new file mode 100644 index 00000000..6969ea81 --- /dev/null +++ b/patches/libcaca_pre.local.patch @@ -0,0 +1,11 @@ +--- libcaca/bootstrap.orig 2020-02-09 17:08:18.969163074 +0000 ++++ libcaca/bootstrap 2020-02-09 18:07:03.387297417 +0000 +@@ -84,7 +84,7 @@ + + # Check for pkg-config + if test "$pkgconfig" = "yes"; then +- if ! pkg-config --version >/dev/null 2>&1; then ++ if ! $PKG_CONFIG --version >/dev/null 2>&1; then + echo "$0: pkg-config not found" + exit 1 + fi diff --git a/patches/toilet_pre.local.patch b/patches/toilet_pre.local.patch new file mode 100644 index 00000000..2150c1d4 --- /dev/null +++ b/patches/toilet_pre.local.patch @@ -0,0 +1,11 @@ +--- toilet/bootstrap.orig 2020-02-09 18:15:11.505838202 +0000 ++++ toilet/bootstrap 2020-02-09 18:33:37.270453498 +0000 +@@ -84,7 +84,7 @@ + + # Check for pkg-config + if test "$pkgconfig" = "yes"; then +- if ! pkg-config --version >/dev/null 2>&1; then ++ if ! $PKG_CONFIG --version >/dev/null 2>&1; then + echo "$0: pkg-config not found" + exit 1 + fi diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 4838717e..01f81ce5 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -8,6 +8,12 @@ pkg_configure_autotools() { -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" -o \ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" -o \ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/config.guess" ]; then + if [ -n "${PKG_PKG_CONFIG}" ]; then + export PKG_CONFIG="${PKG_PKG_CONFIG}"; + fi; + if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then + export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}"; + fi; if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ && [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then for _script_fname in bootstrap bootstrap.sh autogen.sh ""; do @@ -51,6 +57,7 @@ pkg_configure_autotools() { fi; sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache"; fi; + unset PKG_CONFIG PKG_CONFIG_PATH; fi; }; |