From f5df65977a328df94f479f86058a31c827f55f17 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 Feb 2013 12:08:17 +0100 Subject: [PATCH] libcap: cross build support. --- srcpkgs/libcap/libcap-devel.template | 8 ++------ srcpkgs/libcap/libcap-pam.template | 5 +---- srcpkgs/libcap/libcap-progs.template | 5 +---- srcpkgs/libcap/template | 16 +++++++++------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/srcpkgs/libcap/libcap-devel.template b/srcpkgs/libcap/libcap-devel.template index 6e8b70807f7..8f01af14349 100644 --- a/srcpkgs/libcap/libcap-devel.template +++ b/srcpkgs/libcap/libcap-devel.template @@ -1,11 +1,7 @@ # Template file for 'libcap-devel'. # -depends="glibc-devel libcap>=$version" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - +depends="glibc-devel libcap>=${version}" +short_desc="${short_desc} -- development files" do_install() { vmove usr/include usr diff --git a/srcpkgs/libcap/libcap-pam.template b/srcpkgs/libcap/libcap-pam.template index 33f9b5f04fd..13d6896e4bf 100644 --- a/srcpkgs/libcap/libcap-pam.template +++ b/srcpkgs/libcap/libcap-pam.template @@ -1,10 +1,7 @@ # Template file for 'libcap-pam'. # conf_files="/etc/security/capability.conf" -short_desc="${short_desc} (PAM module)" -long_desc="${long_desc} - - This package contains a PAM module provided by the libcap package." +short_desc="${short_desc} -- PAM module" do_install() { vmove usr/lib/security usr/lib diff --git a/srcpkgs/libcap/libcap-progs.template b/srcpkgs/libcap/libcap-progs.template index 498ae26854e..91cfcfccfc7 100644 --- a/srcpkgs/libcap/libcap-progs.template +++ b/srcpkgs/libcap/libcap-progs.template @@ -1,9 +1,6 @@ # Template file for 'libcap-progs'. # -short_desc="${short_desc} (utilities)" -long_desc="${long_desc} - - This package contains binary utilities provided by the libcap package." +short_desc="${short_desc} -- utilities" do_install() { vmove usr/sbin usr diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index dc098fe1174..d5c3cdc000d 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -1,22 +1,24 @@ # Template file for 'libcap' pkgname=libcap version=2.22 -revision=7 +revision=8 subpackages="$pkgname-devel $pkgname-pam $pkgname-progs" -makedepends="perl pam-devel attr-devel" -short_desc="POSIX.1e capabilities library" +makedepends="gperf perl pam-devel attr-devel" +crossmakedepends="pam-devel attr-devel" +short_desc="POSIX.1e capabilities suite" maintainer="Juan RP " homepage="http://sites.google.com/site/fullycapable/" license="GPL-2" distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz" #distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2" checksum=e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f -long_desc=" - libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) - draft 15 capabilities." do_build() { - make ${makejobs} + if [ -n "$XBPS_CROSS_TRIPLET" ]; then + make CC="$XBPS_CROSS_TRIPLET-gcc" BUILD_CC=gcc + else + make + fi } do_install() {