From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 22 Sep 2016 18:37:03 +0000 (-0400)
Subject: build-package.sh: Avoid mess in zlib.pc
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/204bde80a4b28ee5d1bca7924949a8099a1e823f?ds=inline

build-package.sh: Avoid mess in zlib.pc
---

diff --git a/build-package.sh b/build-package.sh
index c2fc6a32..48c323a4 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -696,31 +696,26 @@ if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
 	ln -f -s libgnustl_shared.so libstdc++.so
 fi
 
-if [ ! -f $PKG_CONFIG ]; then
-	echo "Creating pkg-config wrapper..."
-	# We use path to host pkg-config to avoid picking up a cross-compiled pkg-config later on
-	_HOST_PKGCONFIG=`which pkg-config`
-	mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin $PKG_CONFIG_LIBDIR
-	cat > $PKG_CONFIG <<HERE
+# Create pkg-config wrapper. We use path to host pkg-config to
+# avoid picking up a cross-compiled pkg-config later on.
+_HOST_PKGCONFIG=`which pkg-config`
+mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin $PKG_CONFIG_LIBDIR
+cat > $PKG_CONFIG <<HERE
 #!/bin/sh
 export PKG_CONFIG_DIR=
 export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
-# export PKG_CONFIG_SYSROOT_DIR=${TERMUX_PREFIX}
 exec $_HOST_PKGCONFIG "\$@"
 HERE
-	chmod +x $PKG_CONFIG
-
-	# Add a pkg-config file for the system zlib
-	cat > $PKG_CONFIG_LIBDIR/zlib.pc <<HERE
+chmod +x $PKG_CONFIG
+# Add a pkg-config file for the system zlib
+cat > $PKG_CONFIG_LIBDIR/zlib.pc <<HERE
 Name: zlib
 Description: zlib compression library
 Version: 1.2.3
 
 Requires:
-Libs: -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib -lz
-Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
+Libs: -lz
 HERE
-fi
 
 # Keep track of when build started so we can see what files have been created.
 # We start by sleeping so that any generated files above (such as zlib.pc) get