Date: Thursday, August 29, 2019 @ 16:38:30 Author: demize Revision: 361372
Replace wrapper scripts with personality specifications See pkgconf-personality(5). Personality files let you specify the defaults that all paths are based on rather than having a wrapper script that (hopefully) overrides all necessary environment variables that were based on the default personality. Added: pkgconf/trunk/i686-pc-linux-gnu.personality pkgconf/trunk/x86_64-pc-linux-gnu.personality Modified: pkgconf/trunk/PKGBUILD Deleted: pkgconf/trunk/platform-pkg-config.in ---------------------------------+ PKGBUILD | 35 ++++++++++++----------------------- i686-pc-linux-gnu.personality | 5 +++++ platform-pkg-config.in | 11 ----------- x86_64-pc-linux-gnu.personality | 5 +++++ 4 files changed, 22 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-29 15:52:14 UTC (rev 361371) +++ PKGBUILD 2019-08-29 16:38:30 UTC (rev 361372) @@ -6,7 +6,7 @@ pkgname=pkgconf pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Package compiler and linker metadata toolkit" url="https://github.com/pkgconf/pkgconf" license=(custom:ISC) @@ -18,9 +18,12 @@ replaces=(pkg-config) groups=(base-devel) _commit=c862e030cf83447f679e4f49876f5298f0fc9691 # tags/pkgconf-1.6.3 -source=("git+https://git.dereferenced.org/pkgconf/pkgconf#commit=$_commit" platform-pkg-config.in) +source=("git+https://git.dereferenced.org/pkgconf/pkgconf#commit=$_commit" + i686-pc-linux-gnu.personality + x86_64-pc-linux-gnu.personality) sha256sums=('SKIP' - '7c61338fbd83f9783d805c2f2f97b426977895a2f4b79e0ae5bc8e9d7996edaa') + '6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1' + 'c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5') _pcdirs=/usr/lib/pkgconfig:/usr/share/pkgconfig _libdir=/usr/lib @@ -52,27 +55,13 @@ 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" + 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" - # 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 - ln -s pkgconf.1 "$pkgdir/usr/share/man/man1/pkg-config.1" install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING } Added: i686-pc-linux-gnu.personality =================================================================== --- i686-pc-linux-gnu.personality (rev 0) +++ i686-pc-linux-gnu.personality 2019-08-29 16:38:30 UTC (rev 361372) @@ -0,0 +1,5 @@ +Triplet: i686-pc-linux-gnu +SysrootDir: / +DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig +SystemIncludePaths: /usr/include +SystemLibraryPaths: /usr/lib32 Deleted: platform-pkg-config.in =================================================================== --- platform-pkg-config.in 2019-08-29 15:52:14 UTC (rev 361371) +++ platform-pkg-config.in 2019-08-29 16:38:30 UTC (rev 361372) @@ -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 "$@" Added: x86_64-pc-linux-gnu.personality =================================================================== --- x86_64-pc-linux-gnu.personality (rev 0) +++ x86_64-pc-linux-gnu.personality 2019-08-29 16:38:30 UTC (rev 361372) @@ -0,0 +1,5 @@ +Triplet: x86_64-pc-linux-gnu +SysrootDir: / +DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig +SystemIncludePaths: /usr/include +SystemLibraryPaths: /usr/lib