diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2012-01-31 22:03:45 +0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-01 14:42:03 -0600 |
| commit | 17884d7b6462b0fe497f08fec6091ffbe04caa8d (patch) | |
| tree | d9ad1634ea2e5d7d30439a282caa839ec94b2726 | |
| parent | 1d84950234b2aea0f0e3e323ab35e20dbbc77bff (diff) | |
./configure: request pkg-config to provide private libs when static linking
Added wrapper around pkg-config to allow:
- safe options injection via ${QEMU_PKG_CONFIG_FLAGS}
- spaces in path to pkg-config
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
CC: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rwxr-xr-x | configure | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -234,7 +234,11 @@ ld="${LD-${cross_prefix}ld}" libtool="${LIBTOOL-${cross_prefix}libtool}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" -pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}" +pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" +query_pkg_config() { + "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@" +} +pkg_config=query_pkg_config sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" # default flags for all hosts @@ -553,6 +557,7 @@ for opt do --static) static="yes" LDFLAGS="-static $LDFLAGS" + QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS" ;; --mandir=*) mandir="$optarg" ;; @@ -1449,8 +1454,8 @@ fi ########################################## # pkg-config probe -if ! has $pkg_config; then - echo "Error: pkg-config binary '$pkg_config' not found" +if ! has "$pkg_config_exe"; then + echo "Error: pkg-config binary '$pkg_config_exe' not found" exit 1 fi |