improved avoid compiler default paths

2 files changed, 14 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd3bdc3173da..389cb705ff61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Mar 23 10:33:48 UTC 2018
+# Tue Mar 27 11:29:12 UTC 2018
 pkgbase = aarch64-linux-gnu-pkg-config
 	pkgdesc = pkg-config that only looks in /usr/aarch64-linux-gnu/lib/pkgconfig and not in /usr/lib/pkgconfig
 	pkgver = 0.29.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://pkgconfig.freedesktop.org/wiki/
 	arch = x86_64
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 38a28ccc393a..af59f6f41c13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _target=aarch64-linux-gnu
 _pkgname=pkg-config
 pkgname=${_target}-pkg-config
 pkgver=0.29.2
-pkgrel=1
+pkgrel=2
 pkgdesc="pkg-config that only looks in /usr/${_target}/lib/pkgconfig and not in /usr/lib/pkgconfig"
 arch=('x86_64')
 url="http://pkgconfig.freedesktop.org/wiki/"
@@ -17,11 +17,22 @@ md5sums=('f6e931e319531b736fadc017f470e68a'
          'SKIP')
 validpgpkeys=('6B99CE97F17F48C27F722D71023A4420C7EC6914')  # Dan Nicholson
 
+prepare() {
+  cd $_pkgname-$pkgver
+  sed -i "s,prefix=/usr$,prefix=/usr/${_target:?}," check/*.pc
+  sed -i "s,/usr/include/somedir,/usr/${_target:?}/include/somedir," check/check-*
+  sed -i "s,/usr/white\([^s]*\)space,/usr/${_target:?}/white\1space," check/check-whitespace
+  sed -i "s,/usr\([/\"]\),/usr/${_target:?}\1," check/check-variable-override
+  sed -i "s,/usr/\(include\|lib\),/usr/${_target:?}/\1," check/check-system-flags
+}
+
 build() {
   cd $_pkgname-$pkgver
   ./configure \
     --prefix=/usr/${_target} \
     --target=${_target} \
+    --with-system-include-path=/usr/${_target}/include \
+    --with-system-library-path=/usr/${_target}/lib \
     --build=$CHOST
   make
 }