[arch-commits] Commit in krb5/trunk (PKGBUILD krb5-1.9.1-config-script.patch)
Stéphane Gaudreault
stephane at archlinux.org
Thu Jul 28 19:16:56 UTC 2011
Date: Thursday, July 28, 2011 @ 15:16:56
Author: stephane
Revision: 133509
upgpkg: krb5 1.9.1-3
Make krb5-config suppress CFLAGS output and omit extra libraries when called with --libs
Added:
krb5/trunk/krb5-1.9.1-config-script.patch
Modified:
krb5/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 18 +++++++++++++++---
krb5-1.9.1-config-script.patch | 25 +++++++++++++++++++++++++
2 files changed, 40 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-28 18:27:07 UTC (rev 133508)
+++ PKGBUILD 2011-07-28 19:16:56 UTC (rev 133509)
@@ -3,7 +3,7 @@
pkgname=krb5
pkgver=1.9.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Kerberos network authentication system"
arch=('i686' 'x86_64')
url="http://web.mit.edu/kerberos/"
@@ -16,16 +16,28 @@
backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
krb5-kadmind
- krb5-kdc)
+ krb5-kdc
+ krb5-1.9.1-config-script.patch)
sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
'2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
- '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
+ '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
+ '8d1ec8bdb39fec230caace112d1a41ad792f7d97')
options=('!emptydirs')
build() {
tar zxvf ${pkgname}-${pkgver}.tar.gz
cd "${srcdir}/${pkgname}-${pkgver}/src"
+ # - Make krb5-config suppress CFLAGS output when called with --libs
+ # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
+ # http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
+ #
+ # - Omit extra libraries because their interfaces are not exposed to applications
+ # by libkrb5, unless do_deps is set to 1, which indicates that the caller
+ # wants the whole list.
+ # cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
+ patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
+
export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
export CPPFLAGS+=" -I/usr/include/et"
./configure --prefix=/usr \
Added: krb5-1.9.1-config-script.patch
===================================================================
--- krb5-1.9.1-config-script.patch (rev 0)
+++ krb5-1.9.1-config-script.patch 2011-07-28 19:16:56 UTC (rev 133509)
@@ -0,0 +1,25 @@
+diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
+--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500
++++ krb5-1.9.1/src/krb5-config.in 2011-07-28 14:32:00.546990621 -0400
+@@ -186,7 +186,7 @@
+ -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
++ -e 's#\$(CFLAGS)##'`
+
+ if test $library = 'kdb'; then
+ lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
+@@ -214,7 +214,11 @@
+ fi
+
+ if test $library = 'krb5'; then
+- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++ if test 0$do_deps -eq 1 ; then
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++ else
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
++ fi
+ fi
+
+ echo $lib_flags
More information about the arch-commits
mailing list