From 6eb1ac471f312d3102eed92fa36c01bfc6581693 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 11 Jan 2014 11:40:28 +0100 Subject: [PATCH] libcap-ng: make this build on musl. --- .../libcap-ng/patches/pid_t-portability.patch | 12 ++++++++++++ srcpkgs/libcap-ng/template | 19 ++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/libcap-ng/patches/pid_t-portability.patch diff --git a/srcpkgs/libcap-ng/patches/pid_t-portability.patch b/srcpkgs/libcap-ng/patches/pid_t-portability.patch new file mode 100644 index 00000000000..f15e43e1cc8 --- /dev/null +++ b/srcpkgs/libcap-ng/patches/pid_t-portability.patch @@ -0,0 +1,12 @@ +Make this build with musl, uid_t/pid_t are defined in . + +--- utils/proc-llist.h.orig 2014-01-11 11:38:42.960868985 +0100 ++++ utils/proc-llist.h 2014-01-11 11:39:01.776988967 +0100 +@@ -24,6 +24,7 @@ + #ifndef PROC_HEADER + #define PROC_HEADER + ++#include /* uid_t, pid_t */ + #include "config.h" + + diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template index b59b09e9e2b..468993bc185 100644 --- a/srcpkgs/libcap-ng/template +++ b/srcpkgs/libcap-ng/template @@ -1,7 +1,7 @@ # Template file for 'libcap-ng' pkgname=libcap-ng version=0.7.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="python-devel swig" short_desc="An alternate POSIX capabilities library" @@ -10,14 +10,6 @@ homepage="http://people.redhat.com/sgrubb/libcap-ng/" license="GPL-2, LGPL-2.1" distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz" checksum=bf74455c9540667a924d2983090c4eb7285f0a4a82a25becd0a496e8bbf3d8ff -long_desc=" - This library implements the user-space interfaces to the POSIX 1003.1e - capabilities available in Linux kernels. These capabilities are a - partitioning of the all powerful root privilege into a set of distinct - privileges. - - The libcap-ng library is intended to make programming with posix capabilities - much easier than the traditional libcap library." if [ "$CROSS_BUILD" ]; then unset hostmakedepends @@ -25,19 +17,20 @@ if [ "$CROSS_BUILD" ]; then fi libcap-ng-devel_package() { - depends="libcap-ng>=${version}" - short_desc+=" -- development files" + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/share/man/man3 vmove usr/share/aclocal } } libcap-ng-progs_package() { - short_desc+=" -- utilities" + short_desc+=" - utilities" pkg_install() { vmove usr/bin vmove usr/share @@ -46,7 +39,7 @@ libcap-ng-progs_package() { if [ -z "$CROSS_BUILD" ]; then libcap-ng-python_package() { - short_desc+=" -- python bindings" + short_desc+=" - python bindings" depends="python" pycompile_module="capng" pkg_install() {