patch for "FAIL: check-print-options"

3 files changed, 24 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 389cb705ff61..fc5e79918c3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
-# Generated by mksrcinfo v8
-# 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 = 2
+	pkgrel = 3
 	url = http://pkgconfig.freedesktop.org/wiki/
 	arch = x86_64
 	license = GPL
 	depends = glib2
 	source = https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
 	source = https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz.asc
-	md5sums = f6e931e319531b736fadc017f470e68a
-	md5sums = SKIP
+	source = https://gitlab.freedesktop.org/pkg-config/pkg-config/-/commit/2ad16fa7ac9e951bfd8982835df1e7ea5c9ffb57.patch
+	validpgpkeys = 6B99CE97F17F48C27F722D71023A4420C7EC6914
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = f707ba24c57d01965b307856657ed2806e1a49e1552c3438e0562e65b527d405
 
 pkgname = aarch64-linux-gnu-pkg-config
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4619b2435604
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg
+src
+*.patch
diff --git a/PKGBUILD b/PKGBUILD
index af59f6f41c13..93385e96117f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,22 @@
 
 _target=aarch64-linux-gnu
 _pkgname=pkg-config
-pkgname=${_target}-pkg-config
+pkgname="${_target}-pkg-config"
 pkgver=0.29.2
-pkgrel=2
+pkgrel=3
 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/"
 license=('GPL')
 depends=('glib2')
-source=(https://pkgconfig.freedesktop.org/releases/${_pkgname}-${pkgver}.tar.gz{,.asc})
-md5sums=('f6e931e319531b736fadc017f470e68a'
-         'SKIP')
+source=("https://pkgconfig.freedesktop.org/releases/${_pkgname}-${pkgver}.tar.gz"{,.asc}
+    "https://gitlab.freedesktop.org/pkg-config/pkg-config/-/commit/2ad16fa7ac9e951bfd8982835df1e7ea5c9ffb57.patch")
+sha256sums=('SKIP' 'SKIP' 'f707ba24c57d01965b307856657ed2806e1a49e1552c3438e0562e65b527d405')
 validpgpkeys=('6B99CE97F17F48C27F722D71023A4420C7EC6914')  # Dan Nicholson
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd "$_pkgname-$pkgver"
+  patch -p1 -i "$srcdir/2ad16fa7ac9e951bfd8982835df1e7ea5c9ffb57.patch"
   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
@@ -27,23 +28,23 @@ prepare() {
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  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
+    --prefix="/usr/${_target}" \
+    --target="${_target}" \
+    --with-system-include-path="/usr/${_target}/include" \
+    --with-system-library-path="/usr/${_target}/lib" \
+    --build="$CHOST"
   make
 }
 
 check() {
-  cd $_pkgname-$pkgver
+  cd "$_pkgname-$pkgver"
   make check
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd "$_pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   mkdir -p "$pkgdir/usr/bin/"
   mv "$pkgdir/usr/${_target}/bin/${CHOST}-pkg-config"  "$pkgdir/usr/bin/${_target}-pkg-config"