Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkgconf: prepare for replacing pkg-config #3412

Merged
merged 6 commits into from
Nov 18, 2018
Merged

pkgconf: prepare for replacing pkg-config #3412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbc7015
pkgconf: prepare for replacing pkg-config
Oct 4, 2018
294ed8b
pkgconf: add link from pkg-config.1 to pkgconf.1
Oct 4, 2018
d93e5f3
pkg-config: add alternatives
maxice8 Oct 4, 2018
6a0e363
pkgconf: add alternatives, drop conflict with pkg-config
maxice8 Oct 4, 2018
cf22bd0
pkgconf: fix checksum
Nov 17, 2018
fba91f0
pkgconf: make xlint happy
Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions srcpkgs/pkg-config/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
# Template build file for 'pkg-config'
# Template file for 'pkg-config'
pkgname=pkg-config
version=0.29.2
revision=1
revision=2
bootstrap=yes
build_style=gnu-configure
configure_args="--with-internal-glib --disable-host-tool"
# required for gcc6 bootstrap
hostmakedepends="gcc"
short_desc="System for managing library compile/link flags"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://pkgconfig.freedesktop.org/wiki/"
license="GPL-2"
distfiles="http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz"
homepage="http://pkgconfig.freedesktop.org/wiki/"
distfiles="http://pkgconfig.freedesktop.org/releases/${pkgname}-${version}.tar.gz"
checksum=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
alternatives="
pkg-config:pkg-config:/usr/bin/pkg-config.pkg-config
pkg-config:pkg-config.1:/usr/share/man/man1/pkg-config.1.pkg-config
pkg-config:pkg.m4:/usr/share/aclocal/pkg.m4.pkg-config"

case "$XBPS_TARGET_MACHINE" in
mips*) configure_args+=" glib_cv_stack_grows=no glib_cv_uscore=no" ;;
esac

post_install() {
# Add pkg-config suffix to files that are on alternatives
mv ${DESTDIR}/usr/bin/pkg-config{,.pkg-config}
mv ${DESTDIR}/usr/share/man/man1/pkg-config.1{,.pkg-config}
mv ${DESTDIR}/usr/share/aclocal/pkg.m4{,.pkg-config}
}
1 change: 0 additions & 1 deletion srcpkgs/pkgconf-devel
View file
Open in desktop

This file was deleted.

26 changes: 11 additions & 15 deletions srcpkgs/pkgconf/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Template file for 'pkgconf'
pkgname=pkgconf
version=1.5.4
revision=1
conflicts="pkg-config"
revision=2
build_style=gnu-configure # cmake and meson also available
hostmakedepends="libtool"
configure_args="--disable-shared --disable-static"
checkdepends="kyua"
short_desc="Provides compiler and linker configuration"
maintainer="Enno Boland <gottox@voidlinux.eu>"
Expand All @@ -14,19 +13,16 @@ changelog="https://git.dereferenced.org/pkgconf/pkgconf/raw/branch/master/NEWS"
distfiles="https://distfiles.dereferenced.org/pkgconf/${pkgname}-${version}.tar.xz"
checksum=9c5864a4e08428ef52f05a41c948529555458dec6d283b50f8b7d32463c54664

alternatives="
pkg-config:pkg-config:/usr/bin/pkgconf
pkg-config:pkg-config.1:/usr/share/man/man1/pkgconf.1
pkg-config:pkg.m4:/usr/share/aclocal/pkg.m4.pkgconf"

post_install() {
vlicense COPYING
}

pkgconf-devel_package() {
depends="pkgconf-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/aclocal
vmove usr/share/man/man7
vmove "usr/lib/*.so"
vmove "usr/lib/*.a"
}
rm -rf $DESTDIR/usr/include

# Suffix file that conflicts with pkg-config
mv ${DESTDIR}/usr/share/aclocal/pkg.m4{,.pkgconf}
}