From 0abd36c477746e9451be535ea000d5f47c553dc1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 15 Feb 2013 18:23:02 +0100 Subject: [PATCH] mit-krb5: rebuild for -dbg pkgs; cross build support. --- srcpkgs/mit-krb5/mit-krb5-client.template | 3 --- srcpkgs/mit-krb5/mit-krb5-devel.template | 3 --- srcpkgs/mit-krb5/mit-krb5-libs.template | 3 --- srcpkgs/mit-krb5/template | 26 ++++++++++++++--------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/srcpkgs/mit-krb5/mit-krb5-client.template b/srcpkgs/mit-krb5/mit-krb5-client.template index 936713d7648..fc0478116d8 100644 --- a/srcpkgs/mit-krb5/mit-krb5-client.template +++ b/srcpkgs/mit-krb5/mit-krb5-client.template @@ -1,9 +1,6 @@ # Template file for 'mit-krb5-client'. # short_desc="${short_desc} - client programs" -long_desc="${long_desc} - - This package contains the client side programs." do_install() { vmove usr/bin usr diff --git a/srcpkgs/mit-krb5/mit-krb5-devel.template b/srcpkgs/mit-krb5/mit-krb5-devel.template index 5a630f8b188..0806ea92622 100644 --- a/srcpkgs/mit-krb5/mit-krb5-devel.template +++ b/srcpkgs/mit-krb5/mit-krb5-devel.template @@ -4,9 +4,6 @@ noarch=yes depends="db-devel openssl-devel e2fsprogs-devel>=1.4.10_1 mit-krb5-libs>=${version}" short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." do_install() { vmove usr/include usr diff --git a/srcpkgs/mit-krb5/mit-krb5-libs.template b/srcpkgs/mit-krb5/mit-krb5-libs.template index 2fdc0f92e76..44bcdbda874 100644 --- a/srcpkgs/mit-krb5/mit-krb5-libs.template +++ b/srcpkgs/mit-krb5/mit-krb5-libs.template @@ -2,9 +2,6 @@ # conflicts="heimdal-libs>=0" short_desc="${short_desc} - shared libraries" -long_desc="${long_desc} - - This package contains the shared libraries." do_install() { vmove "usr/lib/*.so*" usr/lib diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index b97488f76ca..b12fbc83b6d 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,15 +1,15 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 version=1.11 -revision=1 +revision=2 noextract=yes wrksrc="krb5-${version}" build_style=gnu-configure configure_script="./src/configure" configure_args="--disable-rpath --with-system-et ---with-system-ss --with-system-db --enable-shared CFLAGS=-I/usr/include/et" + --with-system-ss --with-system-db --enable-shared" depends="mit-krb5-client-${version}_${revision}" -makedepends="perl>=0 flex db-devel e2fsprogs-devel openssl-devel" +makedepends="perl flex db-devel e2fsprogs-devel openssl-devel" subpackages="${pkgname}-devel ${pkgname}-libs ${pkgname}-client" conflicts="heimdal>=0" short_desc="MIT Kerberos 5 implementation" @@ -18,14 +18,20 @@ license="MIT" homepage="http://web.mit.edu/Kerberos" distfiles="$homepage/dist/krb5/1.11/krb5-$version-signed.tar" checksum=fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651 -long_desc=" - Kerberos is a network authentication protocol. It is designed to provide - strong authentication for client/server applications by using secret-key - cryptography. A free implementation of this protocol is available from the - Massachusetts Institute of Technology. Kerberos is available in many - commercial products as well." -pre_configure() { +if [ -n "$XBPS_CROSS_TRIPLET" ]; then + makedepends="perl flex e2fsprogs-devel" + crossmakedepends="libfl-devel db-devel e2fsprogs-devel openssl-devel" + configure_args="${configure_args} + ac_cv_func_pthread_once=yes + ac_cv_func_pthread_rwlock_init=yes + acx_pthread_ok=yes + ac_cv_func_regcomp=yes + ac_cv_printf_positional=yes + krb5_cv_attr_constructor_destructor=yes,yes" +fi + +do_extract() { # We have to do this dance because the real distfile is # included in the .tar archive. tar xf $XBPS_SRCDISTDIR/$(basename $distfiles) -C $wrksrc