From 51ff76d4cd21238a5a26a5bda11a106f006f41df Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 14 Oct 2008 10:08:38 +0000 Subject: Bug #186391 - use krb5-config --cflags instead of hardcoding -I/usr/include/heimdal. Untested due to lack of kerberos systems. (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64) --- net-nds/openldap/ChangeLog | 7 ++++++- net-nds/openldap/openldap-2.3.43-r1.ebuild | 5 +++-- net-nds/openldap/openldap-2.4.11-r1.ebuild | 21 +++++++++++++++------ 3 files changed, 24 insertions(+), 9 deletions(-) (limited to 'net-nds/openldap') diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 9dd18b59f850..938627c46a5c 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.335 2008/10/14 09:18:15 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.336 2008/10/14 10:08:38 robbat2 Exp $ + + 14 Oct 2008; Robin H. Johnson + openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild: + Bug #186391 - use krb5-config --cflags instead of hardcoding + -I/usr/include/heimdal. Untested due to lack of kerberos systems. *openldap-2.4.11-r1 (14 Oct 2008) diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild index d06f3e91bdff..eb3aa148b22e 100644 --- a/net-nds/openldap/openldap-2.3.43-r1.ebuild +++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.1 2008/10/14 08:59:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.2 2008/10/14 10:08:38 robbat2 Exp $ EAPI="1" @@ -327,6 +327,7 @@ src_compile() { einfo "Building contributed pw-kerberos" cd "${S}"/contrib/slapd-modules/passwd/ && \ ${CC} -shared -I../../../include ${CFLAGS} -fPIC \ + $(krb5-config --cflags) \ -DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \ die "failed to compile kerberos password module" fi @@ -345,7 +346,7 @@ src_compile() { local mydef local mykrb5inc mydef="-DDO_SAMBA -DDO_KRB5" - mykrb5inc="-I/usr/include/heimdal/" + mykrb5inc="$(krb5-config --cflags)" cd "${S}"/contrib/slapd-modules/smbk5pwd && \ libexecdir="/usr/$(get_libdir)/openldap" \ DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \ diff --git a/net-nds/openldap/openldap-2.4.11-r1.ebuild b/net-nds/openldap/openldap-2.4.11-r1.ebuild index 9accd31a7cba..5a823d889d21 100644 --- a/net-nds/openldap/openldap-2.4.11-r1.ebuild +++ b/net-nds/openldap/openldap-2.4.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v 1.1 2008/10/14 09:18:15 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v 1.2 2008/10/14 10:08:38 robbat2 Exp $ EAPI="1" inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs @@ -288,7 +288,7 @@ src_compile() { emake \ DEFS="-DDO_SAMBA -DDO_KRB5" \ - KRB5_INC="-I/usr/include/heimdal" \ + KRB5_INC="$(krb5-config --cflags)" \ CC=$(tc-getCC) \ || die "emake smbk5pwd failed" fi @@ -297,15 +297,24 @@ src_compile() { cd "${S}/contrib/slapd-modules/passwd" einfo "Building contrib-module: pw-kerberos" $(tc-getCC) -shared \ - -I../../../include ${CFLAGS} -DHAVE_KRB5 -fPIC \ - ${LDFLAGS} -o pw-kerberos.so kerberos.c || die "building pw-kerberos failed" + -I../../../include \ + ${CFLAGS} \ + $(krb5-config --cflags) \ + -DHAVE_KRB5 -fPIC \ + ${LDFLAGS} \ + -o pw-kerberos.so \ + kerberos.c || die "building pw-kerberos failed" fi # We could build pw-radius if GNURadius would install radlib.h cd "${S}/contrib/slapd-modules/passwd" einfo "Building contrib-module: pw-netscape" $(tc-getCC) -shared \ - -I../../../include ${CFLAGS} -fPIC \ - ${LDFLAGS} -o pw-netscape.so netscape.c || die "building pw-netscape failed" + -I../../../include \ + ${CFLAGS} \ + -fPIC \ + ${LDFLAGS} \ + -o pw-netscape.so \ + netscape.c || die "building pw-netscape failed" build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" build_contrib_module "allop" "allop.c" "overlay-allop" -- cgit v1.2.3-65-gdbad