remove pkg-config dependency

This commit is contained in:
Nguyen Anh Quynh 2016-12-20 11:30:26 +08:00
parent bd1632e60c
commit 6d747d1a13
3 changed files with 2 additions and 26 deletions

View file

@ -5,15 +5,6 @@ To compile for Microsoft Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md)
---- ----
[0] Dependencies
For MacOS, Unicorn requires "pkg-config" package.
Brew users can install this with:
$ brew install pkg-config
[1] Tailor Unicorn to your need. [1] Tailor Unicorn to your need.
Out of 6 archtitectures supported by Unicorn (Arm, Arm64, M68K, Mips, Sparc, Out of 6 archtitectures supported by Unicorn (Arm, Arm64, M68K, Mips, Sparc,

View file

@ -33,22 +33,20 @@ Unicorn can be compiled either on Ubuntu or Windows.
$ pacman -S python2 $ pacman -S python2
$ pacman -S make $ pacman -S make
$ pacman -S pkg-config
$ pacman -S mingw-w64-i686-toolchain $ pacman -S mingw-w64-i686-toolchain
- To compile for Windows 64-bit, run: - To compile for Windows 64-bit, run:
$ pacman -S python2 $ pacman -S python2
$ pacman -S make $ pacman -S make
$ pacman -S pkg-config
$ pacman -S mingw-w64-x86_64-toolchain $ pacman -S mingw-w64-x86_64-toolchain
- For Cygwin, "make", "gcc-core", "pkg-config", "libpcre-devel", "zlib-devel" - For Cygwin, "make", "gcc-core", "libpcre-devel", "zlib-devel"
are needed. are needed.
If apt-cyg is available, you can install these with: If apt-cyg is available, you can install these with:
$ apt-cyg install make gcc-core pkg-config libpcre-devel zlib-devel $ apt-cyg install make gcc-core libpcre-devel zlib-devel

13
qemu/configure vendored
View file

@ -268,11 +268,6 @@ libtool="${LIBTOOL-${cross_prefix}libtool}"
nm="${NM-${cross_prefix}nm}" nm="${NM-${cross_prefix}nm}"
strip="${STRIP-${cross_prefix}strip}" strip="${STRIP-${cross_prefix}strip}"
windres="${WINDRES-${cross_prefix}windres}" windres="${WINDRES-${cross_prefix}windres}"
pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
query_pkg_config() {
"${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
}
pkg_config=query_pkg_config
# If the user hasn't specified ARFLAGS, default to 'rv', just as make does. # If the user hasn't specified ARFLAGS, default to 'rv', just as make does.
ARFLAGS="${ARFLAGS-rv}" ARFLAGS="${ARFLAGS-rv}"
@ -595,7 +590,6 @@ for opt do
--static) --static)
static="yes" static="yes"
LDFLAGS="-static $LDFLAGS" LDFLAGS="-static $LDFLAGS"
QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
;; ;;
--mandir=*) mandir="$optarg" --mandir=*) mandir="$optarg"
;; ;;
@ -1065,13 +1059,6 @@ else
echo big/little test failed echo big/little test failed
fi fi
##########################################
# pkg-config probe
if ! has "$pkg_config_exe"; then
error_exit "pkg-config binary '$pkg_config_exe' not found"
fi
########################################## ##########################################
# libtool probe # libtool probe