| 1 |
patrick 10/05/03 18:16:17 |
| 2 |
|
| 3 |
Added: zabbix-1.8.2-as-needed.patch |
| 4 |
Log: |
| 5 |
as-needed fix for #313707, thanks to Yuri Vasilevski for the fixed patch |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/zabbix/files/zabbix-1.8.2-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: zabbix-1.8.2-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naurp zabbix-1.8.2.orig/configure.in zabbix-1.8.2/configure.in |
| 17 |
--- zabbix-1.8.2.orig/configure.in 2010-03-29 11:22:46.000000000 -0600 |
| 18 |
+++ zabbix-1.8.2/configure.in 2010-04-07 12:00:49.170918155 -0500 |
| 19 |
@@ -1077,6 +1077,7 @@ if test "x$want_ldap" = "xyes"; then |
| 20 |
fi |
| 21 |
CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" |
| 22 |
LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}" |
| 23 |
+LIBS="${LIBS} ${LDAP_LIBS}" |
| 24 |
|
| 25 |
found_iconv="no" |
| 26 |
dnl Check for libiconv [by default - skip] |
| 27 |
@@ -1100,6 +1101,7 @@ if test "x$want_openipmi" = "xyes"; then |
| 28 |
fi |
| 29 |
CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}" |
| 30 |
LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}" |
| 31 |
+LIBS="${LIBS} ${OPENIPMI_LIBS}" |
| 32 |
|
| 33 |
RANLIB="ranlib" |
| 34 |
AC_SUBST(RANLIB) |
| 35 |
diff -Naurp zabbix-1.8.2.orig/m4/ldap.m4 zabbix-1.8.2/m4/ldap.m4 |
| 36 |
--- zabbix-1.8.2.orig/m4/ldap.m4 2010-03-29 11:22:43.000000000 -0600 |
| 37 |
+++ zabbix-1.8.2/m4/ldap.m4 2010-04-07 12:00:49.170918155 -0500 |
| 38 |
@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@] |
| 39 |
fi |
| 40 |
|
| 41 |
LDAP_CPPFLAGS=-I$LDAP_INCDIR |
| 42 |
- LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS" |
| 43 |
+ LDAP_LDFLAGS="-L$LDAP_LIBDIR" |
| 44 |
+ LDAP_LIBS="-lldap -llber $LDAP_LIBS" |
| 45 |
|
| 46 |
found_ldap="yes" |
| 47 |
AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.]) |
| 48 |
@@ -92,6 +93,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@] |
| 49 |
|
| 50 |
AC_SUBST(LDAP_CPPFLAGS) |
| 51 |
AC_SUBST(LDAP_LDFLAGS) |
| 52 |
+ AC_SUBST(LDAP_LIBS) |
| 53 |
|
| 54 |
unset _libldap_with |
| 55 |
])dnl |
| 56 |
diff -Naurp zabbix-1.8.2.orig/m4/openipmi.m4 zabbix-1.8.2/m4/openipmi.m4 |
| 57 |
--- zabbix-1.8.2.orig/m4/openipmi.m4 2010-03-29 11:22:43.000000000 -0600 |
| 58 |
+++ zabbix-1.8.2/m4/openipmi.m4 2010-04-07 12:00:49.170918155 -0500 |
| 59 |
@@ -68,7 +68,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@ |
| 60 |
# fi |
| 61 |
|
| 62 |
OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR |
| 63 |
- OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR -lOpenIPMI -lOpenIPMIposix" |
| 64 |
+ OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR" |
| 65 |
+ OPENIPMI_LIBS="-lOpenIPMI -lOpenIPMIposix" |
| 66 |
|
| 67 |
found_openipmi="yes" |
| 68 |
AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.]) |
| 69 |
@@ -85,7 +86,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@ |
| 70 |
fi |
| 71 |
|
| 72 |
AC_SUBST(OPENIPMI_CPPFLAGS) |
| 73 |
- AC_SUBST(OPENIPMOPENIPMIFLAGS) |
| 74 |
+ AC_SUBST(OPENIPMI_LDFLAGS) |
| 75 |
+ AC_SUBST(OPENIPMI_LIBS) |
| 76 |
|
| 77 |
unset _libopenipmi_with |
| 78 |
])dnl |
Archives