Replace wrapper scripts with personality specifications

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

5 files changed, 26 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a20106c58ca..4ff40e6490fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pkgconf-git
 	pkgdesc = pkg-config compatible utility which does not depend on glib
-	pkgver = 1.6.0.7.gbe60112
+	pkgver = 1.6.3.0.gc862e03
 	pkgrel = 1
 	url = https://github.com/pkgconf/pkgconf
 	arch = i686
@@ -16,9 +16,11 @@ pkgbase = pkgconf-git
 	conflicts = pkgconfig
 	conflicts = pkgconf
 	source = git://github.com/pkgconf/pkgconf.git
-	source = platform-pkg-config.in
+	source = i686-pc-linux-gnu.personality
+	source = x86_64-pc-linux-gnu.personality
 	md5sums = SKIP
-	md5sums = 8208d56d649808fe561f088cd32c74e0
+	md5sums = b5bee6aa847bfdcf84ef31229dba32a9
+	md5sums = c6d689e4e8bc7b2b3e13a911bab36e27
 
 pkgname = pkgconf-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cf984c5e639..c89fd8ffdc62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pkgconf-git
 _pkgname=pkgconf
-pkgver=1.6.0.7.gbe60112
+pkgver=1.6.3.0.gc862e03
 pkgrel=1
 pkgdesc='pkg-config compatible utility which does not depend on glib'
 url='https://github.com/pkgconf/pkgconf'
@@ -14,9 +14,11 @@ makedepends=(git)
 conflicts=('pkg-config' 'pkgconfig' 'pkgconf')
 provides=('pkg-config' 'pkgconfig' 'pkgconf')
 source=(git://github.com/pkgconf/pkgconf.git
-        platform-pkg-config.in)
+        i686-pc-linux-gnu.personality
+        x86_64-pc-linux-gnu.personality)
 md5sums=('SKIP'
-         '8208d56d649808fe561f088cd32c74e0')
+         'b5bee6aa847bfdcf84ef31229dba32a9'
+         'c6d689e4e8bc7b2b3e13a911bab36e27')
 
 _pcdirs=/usr/lib/pkgconfig:/usr/share/pkgconfig
 _libdir=/usr/lib
@@ -48,26 +50,12 @@ build() {
 package() {
   DESTDIR="$pkgdir" make -C build install
 
-  # From https://src.fedoraproject.org/rpms/pkgconf/
-  sed -e "s|@TARGET_PLATFORM@|$CHOST|g" \
-      -e "s|@PKGCONF_LIBDIRS@|$_pcdirs|g" \
-      -e "s|@PKGCONF_SYSLIBDIR@|$_libdir|g" \
-      -e "s|@PKGCONF_SYSINCDIR@|$_includedir|g" \
-      platform-pkg-config.in |
-    install -D /dev/stdin "$pkgdir/usr/bin/$CHOST-pkg-config"
-  ln -s $CHOST-pkg-config "$pkgdir/usr/bin/pkg-config"
-
-  # Multilib
-  if [[ $CARCH = x86_64 ]]; then
-    _host32=${CHOST/x86_64/i686}
-    sed -e "s|@TARGET_PLATFORM@|$_host32|g" \
-        -e "s|@PKGCONF_LIBDIRS@|${_pcdirs/lib/lib32}|g" \
-        -e "s|@PKGCONF_SYSLIBDIR@|${_libdir/lib/lib32}|g" \
-        -e "s|@PKGCONF_SYSINCDIR@|$_includedir|g" \
-        platform-pkg-config.in |
-      install -D /dev/stdin "$pkgdir/usr/bin/$_host32-pkg-config"
-    ln -s $_host32-pkg-config "$pkgdir/usr/bin/pkg-config-32"
-  fi
+  install -Dt "$pkgdir/usr/share/pkgconfig/personality.d" -m644 \
+    i686-pc-linux-gnu.personality \
+    x86_64-pc-linux-gnu.personality
+  ln -s pkgconf "$pkgdir/usr/bin/i686-pc-linux-gnu-pkg-config"
+  ln -s pkgconf "$pkgdir/usr/bin/x86_64-pc-linux-gnu-pkg-config"
+  ln -s pkgconf "$pkgdir/usr/bin/pkg-config"
 
   ln -s pkgconf.1 "$pkgdir/usr/share/man/man1/pkg-config.1"
   install -Dt "$pkgdir/usr/share/licenses/$_pkgname" -m644 $_pkgname/COPYING
diff --git a/i686-pc-linux-gnu.personality b/i686-pc-linux-gnu.personality
new file mode 100644
index 000000000000..b76226b66931
--- /dev/null
+++ b/i686-pc-linux-gnu.personality
@@ -0,0 +1,5 @@
+Triplet: i686-pc-linux-gnu
+SysrootDir: /
+DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig
+SystemIncludePaths: /usr/include
+SystemLibraryPaths: /usr/lib32
diff --git a/platform-pkg-config.in b/platform-pkg-config.in
deleted file mode 100644
index 3f6b9a78a19d..000000000000
--- a/platform-pkg-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config
-# Platform: @TARGET_PLATFORM@
-
-: ${PKG_CONFIG_LIBDIR=@PKGCONF_LIBDIRS@}
-: ${PKG_CONFIG_SYSTEM_LIBRARY_PATH=@PKGCONF_SYSLIBDIR@} 
-: ${PKG_CONFIG_SYSTEM_INCLUDE_PATH=@PKGCONF_SYSINCDIR@}
-export PKG_CONFIG_LIBDIR PKG_CONFIG_SYSTEM_LIBRARY_PATH PKG_CONFIG_SYSTEM_INCLUDE_PATH
-
-exec pkgconf "$@" 
diff --git a/x86_64-pc-linux-gnu.personality b/x86_64-pc-linux-gnu.personality
new file mode 100644
index 000000000000..45788692fa24
--- /dev/null
+++ b/x86_64-pc-linux-gnu.personality
@@ -0,0 +1,5 @@
+Triplet: x86_64-pc-linux-gnu
+SysrootDir: /
+DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig
+SystemIncludePaths: /usr/include
+SystemLibraryPaths: /usr/lib