buildscripts: Stop misusing --prefix

This makes local build paths end up in pkg-config files, preventing e.g. transferring the "prefix" dir to another environment. Instead, provide DESTDIR on installation and use the sysroot feature of pkg-config.
mpv-android · Dec 22, 2017 · 5b5b4ed · 5b5b4ed
1 parent 078ce24
commit 5b5b4ed
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 23 deletions.
diff --git a/buildscripts/buildall.sh b/buildscripts/buildall.sh
@@ -45,6 +45,13 @@ loadarch () {
 	else
 		export CC=$ndk_triple-gcc
 	fi
+
+	if [ ! -d "./prefix$dir_suffix" ]; then
+		mkdir "prefix$dir_suffix"
+		# enforce flat structure (/usr/local -> /)
+		ln -s . "./prefix$dir_suffix/usr"
+		ln -s . "./prefix$dir_suffix/local"
+	fi
 }
 
 build () {

diff --git a/buildscripts/path.sh b/buildscripts/path.sh
@@ -12,5 +12,11 @@ if [ "$os" == "macosx" ]; then
 	export SED=gsed
 fi
 
+# configure pkg-config paths if inside buildscripts
+if [ -n "$ndk_triple" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$PWD/../../prefix$dir_suffix"
+	export PKG_CONFIG_LIBDIR="$PKG_CONFIG_SYSROOT_DIR/lib/pkgconfig"
+fi
+
 export PATH="$DIR/sdk/ndk-toolchain$ndk_suffix/bin:$DIR/sdk/android-ndk-r16b:$DIR/sdk/android-sdk-$os/tools:$PATH"
 export ANDROID_HOME="$DIR/sdk/android-sdk-$os"
diff --git a/buildscripts/scripts/ffmpeg.sh b/buildscripts/scripts/ffmpeg.sh
@@ -22,13 +22,12 @@ cpuflags="-ftree-vectorize"
 [[ "$ndk_triple" == "arm"* ]] && cpuflags="$cpuflags -mfpu=neon -mcpu=cortex-a8"
 
 prefix="`pwd`/../../../prefix$dir_suffix"
-PKG_CONFIG_LIBDIR="$prefix/lib/pkgconfig" \
 ../configure \
 	--target-os=android --enable-cross-compile --cross-prefix=$ndk_triple- --cc=$CC \
 	--arch=${ndk_triple%%-*} --cpu=$cpu --enable-{jni,mediacodec,gmp,gnutls} \
 	--extra-cflags="-I$prefix/include $cpuflags" --extra-ldflags="-L$prefix/lib" \
 	--disable-static --enable-shared --enable-version3 \
-	--prefix="$prefix" --pkg-config=pkg-config --disable-{debug,doc}
+	--pkg-config=pkg-config --disable-{debug,doc}
 
 make -j6
-make install
+make DESTDIR="$prefix" install
diff --git a/buildscripts/scripts/freetype2.sh b/buildscripts/scripts/freetype2.sh
@@ -20,8 +20,7 @@ PKG_CONFIG=/bin/false \
 ../configure \
 	--host=$ndk_triple \
 	--enable-static --disable-shared \
-	--with-png=no \
-	--prefix="`pwd`/../../../prefix$dir_suffix"
+	--with-png=no
 
 make -j6
-make install
+make DESTDIR="`pwd`/../../../prefix$dir_suffix" install
diff --git a/buildscripts/scripts/fribidi.sh b/buildscripts/scripts/fribidi.sh
@@ -19,8 +19,7 @@ cd _build$dir_suffix
 PKG_CONFIG=/bin/false \
 ../configure \
 	--host=$ndk_triple \
-	--enable-static --disable-shared \
-	--prefix="`pwd`/../../../prefix$dir_suffix"
+	--enable-static --disable-shared
 
 make -j6
-make install
+make DESTDIR="`pwd`/../../../prefix$dir_suffix" install
diff --git a/buildscripts/scripts/gnutls.sh b/buildscripts/scripts/gnutls.sh
@@ -18,16 +18,14 @@ extra=
 [[ "$ndk_triple" == "aarch64"* && "$CC" == *"clang" ]] \
 	&& extra="--disable-hardware-acceleration"
 
-PKG_CONFIG_LIBDIR="`pwd`/../../../prefix$dir_suffix/lib/pkgconfig" \
 ../configure \
 	--host=$ndk_triple $extra \
 	--enable-static --disable-shared \
 	--with-nettle-mini --with-included-{libtasn1,unistring} \
-	--disable-{doc,tools,cxx,tests} --without-p11-kit \
-	--prefix="`pwd`/../../../prefix$dir_suffix"
+	--disable-{doc,tools,cxx,tests} --without-p11-kit
 
 make -j6
-make install
+make DESTDIR="`pwd`/../../../prefix$dir_suffix" install
 # fix linking (pkg-config seems to ignore Requires.private)
 ${SED:-sed} '/^Libs:/ s|$| -lnettle -lhogweed|' -i \
 	../../../prefix$dir_suffix/lib/pkgconfig/gnutls.pc
diff --git a/buildscripts/scripts/libass.sh b/buildscripts/scripts/libass.sh
@@ -16,12 +16,10 @@ fi
 mkdir -p _build$dir_suffix
 cd _build$dir_suffix
 
-PKG_CONFIG_LIBDIR="`pwd`/../../../prefix$dir_suffix/lib/pkgconfig" \
 ../configure \
 	--host=$ndk_triple \
 	--enable-static --disable-shared \
-	--disable-require-system-font-provider \
-	--prefix="`pwd`/../../../prefix$dir_suffix"
+	--disable-require-system-font-provider
 
 make -j6
-make install
+make DESTDIR="`pwd`/../../../prefix$dir_suffix" install
diff --git a/buildscripts/scripts/lua.sh b/buildscripts/scripts/lua.sh
@@ -26,7 +26,7 @@ make INSTALL=${INSTALL:-install} INSTALL_TOP=`pwd`/../../prefix$dir_suffix TO_BI
 
 # make pc only generates a partial pkg-config file because ????
 mkdir -p ../../prefix$dir_suffix/lib/pkgconfig
-make INSTALL_TOP=`pwd`/../../prefix pc > ../../prefix$dir_suffix/lib/pkgconfig/lua.pc
+make pc > ../../prefix$dir_suffix/lib/pkgconfig/lua.pc
 cat >>../../prefix$dir_suffix/lib/pkgconfig/lua.pc <<'EOF'
 Name: Lua
 Description:

diff --git a/buildscripts/scripts/mpv.sh b/buildscripts/scripts/mpv.sh
@@ -16,12 +16,11 @@ fi
 extrald=
 [[ "$ndk_triple" == "aarch64"* ]] && extrald="-fuse-ld=gold"
 
-PKG_CONFIG_LIBDIR="`pwd`/../../prefix$dir_suffix/lib/pkgconfig" \
 LDFLAGS="$extrald" \
 ./waf configure \
 	--disable-iconv --lua=52 \
 	--enable-libmpv-shared \
-	--prefix=/ --disable-manpage-build \
+	--disable-manpage-build \
 	-o "`pwd`/_build$dir_suffix"
 
 ./waf build -p -j6

diff --git a/buildscripts/scripts/nettle.sh b/buildscripts/scripts/nettle.sh
@@ -16,11 +16,10 @@ cd _build$dir_suffix
 
 ../configure \
 	--host=$ndk_triple \
-	--enable-mini-gmp --disable-shared \
-	--prefix="`pwd`/../../../prefix$dir_suffix"
+	--enable-mini-gmp --disable-shared
 
 make -j6
-make install
+make DESTDIR="`pwd`/../../../prefix$dir_suffix" install
 # for ffmpeg:
 cat >../../../prefix$dir_suffix/include/gmp.h <<'EOF'
 #include <nettle/mini-gmp.h>