[arch-commits] Commit in pkgconf/repos (6 files)
Johannes Löthberg
demize at archlinux.org
Fri Sep 6 18:35:33 UTC 2019
Date: Friday, September 6, 2019 @ 18:35:33
Author: demize
Revision: 361989
db-move: moved pkgconf from [testing] to [core] (x86_64)
Added:
pkgconf/repos/core-x86_64/PKGBUILD
(from rev 361988, pkgconf/repos/testing-x86_64/PKGBUILD)
pkgconf/repos/core-x86_64/i686-pc-linux-gnu.personality
(from rev 361988, pkgconf/repos/testing-x86_64/i686-pc-linux-gnu.personality)
pkgconf/repos/core-x86_64/x86_64-pc-linux-gnu.personality
(from rev 361988, pkgconf/repos/testing-x86_64/x86_64-pc-linux-gnu.personality)
Deleted:
pkgconf/repos/core-x86_64/PKGBUILD
pkgconf/repos/core-x86_64/platform-pkg-config.in
pkgconf/repos/testing-x86_64/
---------------------------------------------+
/PKGBUILD | 69 ++++++++++++++++++++++
core-x86_64/PKGBUILD | 80 --------------------------
core-x86_64/i686-pc-linux-gnu.personality | 5 +
core-x86_64/platform-pkg-config.in | 11 ---
core-x86_64/x86_64-pc-linux-gnu.personality | 5 +
5 files changed, 79 insertions(+), 91 deletions(-)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2019-09-06 18:34:27 UTC (rev 361988)
+++ core-x86_64/PKGBUILD 2019-09-06 18:35:33 UTC (rev 361989)
@@ -1,80 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Piotr Gorski <lucjan.lucjanov at gmail.com>
-# Contributor: Lucy <lucy at luz.lu>
-# Contributor: Bartlomiej Piotrowski <nospam at bpiotrowski.pl>
-
-pkgname=pkgconf
-pkgver=1.6.3
-pkgrel=1
-pkgdesc="Package compiler and linker metadata toolkit"
-url="https://github.com/pkgconf/pkgconf"
-license=(custom:ISC)
-arch=(x86_64)
-depends=(glibc sh)
-makedepends=(git)
-provides=(pkg-config pkgconfig)
-conflicts=(pkg-config)
-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)
-sha256sums=('SKIP'
- '7c61338fbd83f9783d805c2f2f97b426977895a2f4b79e0ae5bc8e9d7996edaa')
-
-_pcdirs=/usr/lib/pkgconfig:/usr/share/pkgconfig
-_libdir=/usr/lib
-_includedir=/usr/include
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^pkgconf-//;s/-/+/g'
-}
-
-prepare() {
- mkdir build
- cd $pkgname
- ./autogen.sh
-}
-
-build() {
- cd build
- ../$pkgname/configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-pkg-config-dir="$_pcdirs" \
- --with-system-libdir="$_libdir" \
- --with-system-includedir="$_includedir" \
- --disable-static
- make
-}
-
-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
-
- ln -s pkgconf.1 "$pkgdir/usr/share/man/man1/pkg-config.1"
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING
-}
-
-# vim:set sw=2 et:
Copied: pkgconf/repos/core-x86_64/PKGBUILD (from rev 361988, pkgconf/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2019-09-06 18:35:33 UTC (rev 361989)
@@ -0,0 +1,69 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Piotr Gorski <lucjan.lucjanov at gmail.com>
+# Contributor: Lucy <lucy at luz.lu>
+# Contributor: Bartlomiej Piotrowski <nospam at bpiotrowski.pl>
+
+pkgname=pkgconf
+pkgver=1.6.3
+pkgrel=2
+pkgdesc="Package compiler and linker metadata toolkit"
+url="https://github.com/pkgconf/pkgconf"
+license=(custom:ISC)
+arch=(x86_64)
+depends=(glibc sh)
+makedepends=(git)
+provides=(pkg-config pkgconfig)
+conflicts=(pkg-config)
+replaces=(pkg-config)
+groups=(base-devel)
+_commit=c862e030cf83447f679e4f49876f5298f0fc9691 # tags/pkgconf-1.6.3
+source=("git+https://git.dereferenced.org/pkgconf/pkgconf#commit=$_commit"
+ i686-pc-linux-gnu.personality
+ x86_64-pc-linux-gnu.personality)
+sha256sums=('SKIP'
+ '6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1'
+ 'c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5')
+
+_pcdirs=/usr/lib/pkgconfig:/usr/share/pkgconfig
+_libdir=/usr/lib
+_includedir=/usr/include
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^pkgconf-//;s/-/+/g'
+}
+
+prepare() {
+ mkdir build
+ cd $pkgname
+ ./autogen.sh
+}
+
+build() {
+ cd build
+ ../$pkgname/configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-pkg-config-dir="$_pcdirs" \
+ --with-system-libdir="$_libdir" \
+ --with-system-includedir="$_includedir" \
+ --disable-static
+ make
+}
+
+package() {
+ DESTDIR="$pkgdir" make -C build install
+
+ 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
+}
+
+# vim:set sw=2 et:
Copied: pkgconf/repos/core-x86_64/i686-pc-linux-gnu.personality (from rev 361988, pkgconf/repos/testing-x86_64/i686-pc-linux-gnu.personality)
===================================================================
--- core-x86_64/i686-pc-linux-gnu.personality (rev 0)
+++ core-x86_64/i686-pc-linux-gnu.personality 2019-09-06 18:35:33 UTC (rev 361989)
@@ -0,0 +1,5 @@
+Triplet: i686-pc-linux-gnu
+SysrootDir: /
+DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig
+SystemIncludePaths: /usr/include
+SystemLibraryPaths: /usr/lib32
Deleted: core-x86_64/platform-pkg-config.in
===================================================================
--- core-x86_64/platform-pkg-config.in 2019-09-06 18:34:27 UTC (rev 361988)
+++ core-x86_64/platform-pkg-config.in 2019-09-06 18:35:33 UTC (rev 361989)
@@ -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 "$@"
Copied: pkgconf/repos/core-x86_64/x86_64-pc-linux-gnu.personality (from rev 361988, pkgconf/repos/testing-x86_64/x86_64-pc-linux-gnu.personality)
===================================================================
--- core-x86_64/x86_64-pc-linux-gnu.personality (rev 0)
+++ core-x86_64/x86_64-pc-linux-gnu.personality 2019-09-06 18:35:33 UTC (rev 361989)
@@ -0,0 +1,5 @@
+Triplet: x86_64-pc-linux-gnu
+SysrootDir: /
+DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig
+SystemIncludePaths: /usr/include
+SystemLibraryPaths: /usr/lib
More information about the arch-commits
mailing list