diff options
author | Patrick Lauer <patrick@gentoo.org> | 2010-05-03 18:16:17 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2010-05-03 18:16:17 +0000 |
commit | e37e61e1f4fe58639a7fa74039a4fd43cb5dc3ba (patch) | |
tree | edc2f8333e0fadf7a3230c932339c922c64724ae /net-analyzer/zabbix/files | |
parent | Make sure -ltermcap is not used wrt #276787 by Michal Janke. (diff) | |
download | historical-e37e61e1f4fe58639a7fa74039a4fd43cb5dc3ba.tar.gz historical-e37e61e1f4fe58639a7fa74039a4fd43cb5dc3ba.tar.bz2 historical-e37e61e1f4fe58639a7fa74039a4fd43cb5dc3ba.zip |
as-needed fix for #313707, thanks to Yuri Vasilevski for the fixed patch
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/zabbix/files')
-rw-r--r-- | net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch b/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch new file mode 100644 index 000000000000..6e7f082fb4fd --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch @@ -0,0 +1,63 @@ +diff -Naurp zabbix-1.8.2.orig/configure.in zabbix-1.8.2/configure.in +--- zabbix-1.8.2.orig/configure.in 2010-03-29 11:22:46.000000000 -0600 ++++ zabbix-1.8.2/configure.in 2010-04-07 12:00:49.170918155 -0500 +@@ -1077,6 +1077,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] +@@ -1100,6 +1101,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.2.orig/m4/ldap.m4 zabbix-1.8.2/m4/ldap.m4 +--- zabbix-1.8.2.orig/m4/ldap.m4 2010-03-29 11:22:43.000000000 -0600 ++++ zabbix-1.8.2/m4/ldap.m4 2010-04-07 12:00:49.170918155 -0500 +@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@] + fi + + LDAP_CPPFLAGS=-I$LDAP_INCDIR +- LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS" ++ LDAP_LDFLAGS="-L$LDAP_LIBDIR" ++ LDAP_LIBS="-lldap -llber $LDAP_LIBS" + + found_ldap="yes" + AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.]) +@@ -92,6 +93,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.2.orig/m4/openipmi.m4 zabbix-1.8.2/m4/openipmi.m4 +--- zabbix-1.8.2.orig/m4/openipmi.m4 2010-03-29 11:22:43.000000000 -0600 ++++ zabbix-1.8.2/m4/openipmi.m4 2010-04-07 12:00:49.170918155 -0500 +@@ -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 |