diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2009-05-28 06:34:33 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2009-05-28 06:34:33 +0000 |
| commit | 17d7d16b96d433ff4c7a37d6a480e28e217df1b2 (patch) | |
| tree | eea664de365bd9a3371586d1cdeb7197d27978ee /gnome-extra/evolution-data-server | |
| parent | Remove mask for app-admin/eselect-9999; live ebuild has been removed. (diff) | |
| download | gentoo-2-17d7d16b96d433ff4c7a37d6a480e28e217df1b2.tar.gz gentoo-2-17d7d16b96d433ff4c7a37d6a480e28e217df1b2.tar.bz2 gentoo-2-17d7d16b96d433ff4c7a37d6a480e28e217df1b2.zip | |
Fixed configure with USE=kerberos and --as-needed (bug #271492).
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/evolution-data-server')
3 files changed, 44 insertions, 3 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 4080b092f8b7..f865d406fd92 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.231 2009/05/23 22:11:41 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.232 2009/05/28 06:34:33 dev-zero Exp $ + + 28 May 2009; Tiziano Müller <dev-zero@gentoo.org> + evolution-data-server-2.26.2.ebuild, + +files/evolution-data-server-2.26.2-as-needed-configure.patch: + Fixed configure with USE=kerberos and --as-needed (bug #271492). *evolution-data-server-2.26.2 (23 May 2009) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild index 2847d182bcb4..765949b65025 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild,v 1.1 2009/05/23 22:11:42 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.26.2.ebuild,v 1.2 2009/05/28 06:34:33 dev-zero Exp $ EAPI="2" @@ -72,7 +72,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch # Fix building evo-exchange with --as-needed, upstream bug #342830 - epatch "${FILESDIR}"/${PN}-2.25.5-as-needed.patch + # and configure failing to detect kerberos5-libs with as-needed + epatch \ + "${FILESDIR}"/${PN}-2.25.5-as-needed.patch \ + "${FILESDIR}"/${P}-as-needed-configure.patch # gtk-doc-am and gnome-common needed for this intltoolize --force --copy --automake || die "intltoolize failed" diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch new file mode 100644 index 000000000000..8db09e87acbc --- /dev/null +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch @@ -0,0 +1,33 @@ +diff -Naur evolution-data-server-2.26.2.orig/configure.in evolution-data-server-2.26.2/configure.in +--- evolution-data-server-2.26.2.orig/configure.in 2009-05-28 07:54:11.117306805 +0200 ++++ evolution-data-server-2.26.2/configure.in 2009-05-28 07:56:19.107288441 +0200 +@@ -1196,24 +1196,24 @@ + + msg_krb5="no" + if test "x${with_krb5}" != "xno"; then +- LDFLAGS_save="$LDFLAGS" ++ LIBS_save="$LIBS" + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" + heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" + sunlibs="-lkrb5 -lgss" + AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5, + [ +- LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs" ++ LIBS="$LIBS -L$with_krb5_libs $mitlibs" + AC_TRY_LINK([#include <krb5.h>],krb5_init_context, ac_cv_lib_kerberos5="$mitlibs", + [ +- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs" ++ LIBS="$LIBS_save -L$with_krb5_libs $heimlibs" + AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", + [ +- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs" ++ LIBS="$LIBS_save -L$with_krb5_libs $sunlibs" + AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no") + ]) + ]) +- LDFLAGS="$LDFLAGS_save" ++ LIBS="$LIBS_save" + ]) + if test "$ac_cv_lib_kerberos5" != "no"; then + AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5]) |