highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-12 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Do not export PKG_CONFIG_{PATH|LIBDIR} variables

Browse Source
This commit is contained in:
Hennadii Stepanov
2022-07-23 23:31:01 +01:00
parent 194f6dc43c
commit b9f06bf05b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -19,6 +19,16 @@ if test "$PKG_CONFIG" = ""; then
AC_MSG_ERROR([pkg-config not found]) AC_MSG_ERROR([pkg-config not found])
fi fi
# When compiling with depends, the `PKG_CONFIG_PATH` and `PKG_CONFIG_LIBDIR` variables,
# being set in a `config.site` file, are not exported to let the `--config-cache` option
# work properly.
if test -n "$PKG_CONFIG_PATH"; then
PKG_CONFIG="env PKG_CONFIG_PATH=$PKG_CONFIG_PATH $PKG_CONFIG"
fi
if test -n "$PKG_CONFIG_LIBDIR"; then
PKG_CONFIG="env PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR $PKG_CONFIG"
fi
BITCOIN_DAEMON_NAME=bitcoind BITCOIN_DAEMON_NAME=bitcoind
BITCOIN_GUI_NAME=bitcoin-qt BITCOIN_GUI_NAME=bitcoin-qt
BITCOIN_CLI_NAME=bitcoin-cli BITCOIN_CLI_NAME=bitcoin-cli

7
depends/config.site.in
View File

@ -84,12 +84,9 @@ fi
PKG_CONFIG="$(which pkg-config) --static" PKG_CONFIG="$(which pkg-config) --static"
# These two need to remain exported because pkg-config does not see them PKG_CONFIG_PATH="${depends_prefix}/share/pkgconfig:${depends_prefix}/lib/pkgconfig"
# otherwise. That means they must be unexported at the end of configure.ac to
# avoid ruining the cache. Sigh.
export PKG_CONFIG_PATH="${depends_prefix}/share/pkgconfig:${depends_prefix}/lib/pkgconfig"
if test -z "@allow_host_packages@"; then if test -z "@allow_host_packages@"; then
export PKG_CONFIG_LIBDIR="${depends_prefix}/lib/pkgconfig" PKG_CONFIG_LIBDIR="${depends_prefix}/lib/pkgconfig"
fi fi
CPPFLAGS="-I${depends_prefix}/include/ ${CPPFLAGS}" CPPFLAGS="-I${depends_prefix}/include/ ${CPPFLAGS}"