Fix for as-needed building by Yuri Vasilevski, fixes #305449

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 73 insertions, 2 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 5a16b8be33f5..23b6a061aee4 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.22 2010/01/12 13:11:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.23 2010/02/20 20:03:47 patrick Exp $
+
+  20 Feb 2010; Patrick Lauer <patrick@gentoo.org> zabbix-1.8-r1.ebuild,
+  +files/zabbix-as-needed.patch:
+  Fix for as-needed building by Yuri Vasilevski, fixes #305449
 
   12 Jan 2010; Patrick Lauer <patrick@gentoo.org> zabbix-1.8.ebuild,
   zabbix-1.8-r1.ebuild:
diff --git a/net-analyzer/zabbix/files/zabbix-as-needed.patch b/net-analyzer/zabbix/files/zabbix-as-needed.patch
new file mode 100644
index 000000000000..36a56d9e88c0
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-as-needed.patch
@@ -0,0 +1,63 @@
+diff -Naurp zabbix-1.8.orig//configure.in zabbix-1.8/configure.in
+--- zabbix-1.8.orig//configure.in	2009-12-07 13:43:58.000000000 -0600
++++ zabbix-1.8/configure.in	2010-02-16 15:23:47.975288173 -0600
+@@ -1093,6 +1093,7 @@ if test "x$want_ldap" = "xyes"; then
+ fi
+ CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
+ LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
++LIBS="${LIBS} ${LDAP_LIBS}"
+ 
+ found_iconv="no"
+ dnl Check for libiconv [by default - skip]
+@@ -1116,6 +1117,7 @@ if test "x$want_openipmi" = "xyes"; then
+ fi
+ CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}"
+ LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}"
++LIBS="${LIBS} ${OPENIPMI_LIBS}"
+ 
+ RANLIB="ranlib"
+ AC_SUBST(RANLIB)
+diff -Naurp zabbix-1.8.orig//m4/ldap.m4 zabbix-1.8/m4/ldap.m4
+--- zabbix-1.8.orig//m4/ldap.m4	2009-12-07 13:43:56.000000000 -0600
++++ zabbix-1.8/m4/ldap.m4	2010-02-16 15:19:53.961978203 -0600
+@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
+                fi
+ 
+                LDAP_CPPFLAGS=-I$LDAP_INCDIR
+-               LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap $LDAP_LIBS"
++               LDAP_LDFLAGS="-L$LDAP_LIBDIR"
++               LDAP_LIBS="-lldap $LDAP_LIBS"
+ 
+                found_ldap="yes"
+                AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
+@@ -91,6 +92,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
+ 
+   AC_SUBST(LDAP_CPPFLAGS)
+   AC_SUBST(LDAP_LDFLAGS)
++  AC_SUBST(LDAP_LIBS)
+ 
+   unset _libldap_with
+ ])dnl
+diff -Naurp zabbix-1.8.orig//m4/openipmi.m4 zabbix-1.8/m4/openipmi.m4
+--- zabbix-1.8.orig//m4/openipmi.m4	2009-12-07 13:43:56.000000000 -0600
++++ zabbix-1.8/m4/openipmi.m4	2010-02-16 15:21:53.618633050 -0600
+@@ -68,7 +68,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
+ #               fi
+ 
+                OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR
+-               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR -lOpenIPMI -lOpenIPMIposix"
++               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR"
++               OPENIPMI_LIBS="-lOpenIPMI -lOpenIPMIposix"
+ 
+                found_openipmi="yes"
+                AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.])
+@@ -85,7 +86,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
+   fi
+ 
+   AC_SUBST(OPENIPMI_CPPFLAGS)
+-  AC_SUBST(OPENIPMOPENIPMIFLAGS)
++  AC_SUBST(OPENIPMI_LDFLAGS)
++  AC_SUBST(OPENIPMI_LIBS)
+ 
+   unset _libopenipmi_with
+ ])dnl
diff --git a/net-analyzer/zabbix/zabbix-1.8-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8-r1.ebuild
index 1bbc49ec4687..1ac87177a351 100644
--- a/net-analyzer/zabbix/zabbix-1.8-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8-r1.ebuild,v 1.2 2010/01/12 13:11:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8-r1.ebuild,v 1.3 2010/02/20 20:03:47 patrick Exp $
 
 EAPI="2"
 
@@ -179,6 +179,10 @@ pkg_postinst() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/zabbix-as-needed.patch"
+}
+
 src_configure() {
 	econf \
 		$(use_enable server) \