| 1 |
mattm 11/11/29 00:08:44 |
| 2 |
|
| 3 |
Added: zabbix-1.8.9-as-needed.patch |
| 4 |
Log: |
| 5 |
Troubleshooted bug #392311 which involved changes to our patches to the automake scripts for zabbix 1.8.9, removed keywords from zabbix-1.8.9, added zabbix-1.8.9-as-needed.patch and zabbix-1.8.9-r1 ebuild which applies our updated patch correctly. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.39/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: zabbix-1.8.9-as-needed.patch |
| 16 |
=================================================================== |
| 17 |
From 90b086b4daebf61756e3d6f8926cf8951a2fc96a Mon Sep 17 00:00:00 2001 |
| 18 |
From: Vladimir V. Kamarzin <vvk@××××××××.org> |
| 19 |
Date: Fri, 22 Oct 2010 17:47:01 +0600 |
| 20 |
Subject: [PATCH 1/2] Fix linking with ldap libs |
| 21 |
|
| 22 |
Move "-lldap -llber" from LDAP_LDFLAGS to LDAP_LIBS and include them to |
| 23 |
LIBS |
| 24 |
--- |
| 25 |
configure.in | 1 + |
| 26 |
m4/ldap.m4 | 4 +++- |
| 27 |
2 files changed, 4 insertions(+), 1 deletions(-) |
| 28 |
|
| 29 |
diff --git a/configure.in b/configure.in |
| 30 |
index d3d981b..b11b2ee 100644 |
| 31 |
--- a/configure.in |
| 32 |
+++ b/configure.in |
| 33 |
@@ -1281,6 +1281,7 @@ if test "x$want_ldap" = "xyes"; then |
| 34 |
fi |
| 35 |
CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" |
| 36 |
SERVER_LDFLAGS="${SERVER_LDFLAGS} ${LDAP_LDFLAGS}" |
| 37 |
+LIBS="${LIBS} ${LDAP_LIBS}" |
| 38 |
PROXY_LDFLAGS="${PROXY_LDFLAGS} ${LDAP_LDFLAGS}" |
| 39 |
AGENT_LDFLAGS="${AGENT_LDFLAGS} ${LDAP_LDFLAGS}" |
| 40 |
|
| 41 |
found_iconv="no" |
| 42 |
dnl Check for libiconv [by default - skip] |
| 43 |
diff --git a/m4/ldap.m4 b/m4/ldap.m4 |
| 44 |
index 29e97cd..885b3e0 100644 |
| 45 |
--- a/m4/ldap.m4 |
| 46 |
+++ b/m4/ldap.m4 |
| 47 |
@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> |
| 48 |
fi |
| 49 |
|
| 50 |
LDAP_CPPFLAGS=-I$LDAP_INCDIR |
| 51 |
- LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS" |
| 52 |
+ LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS" |
| 53 |
+ LDAP_LIBS="-lldap -llber $LDAP_LIBS" |
| 54 |
|
| 55 |
found_ldap="yes" |
| 56 |
AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.]) |
| 57 |
@@ -92,6 +93,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> |
| 58 |
|
| 59 |
AC_SUBST(LDAP_CPPFLAGS) |
| 60 |
AC_SUBST(LDAP_LDFLAGS) |
| 61 |
+ AC_SUBST(LDAP_LIBS) |
| 62 |
|
| 63 |
unset _libldap_with |
| 64 |
])dnl |
| 65 |
-- |
| 66 |
1.7.3.1 |
| 67 |
|
| 68 |
From f6378e6aeb0bec1883a83c70c8cdfd1213f11f97 Mon Sep 17 00:00:00 2001 |
| 69 |
From: Vladimir V. Kamarzin <vvk@××××××××.org> |
| 70 |
Date: Fri, 22 Oct 2010 17:49:16 +0600 |
| 71 |
Subject: [PATCH 2/2] m4/ax_lib_postgresql.m4: move -pq from POSTGRESQL_LDFLAGS to POSTGRESQL_LIBS |
| 72 |
|
| 73 |
--- |
| 74 |
m4/ax_lib_postgresql.m4 | 4 +++- |
| 75 |
1 files changed, 3 insertions(+), 1 deletions(-) |
| 76 |
|
| 77 |
diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 |
| 78 |
index fe06f66..934d12c 100644 |
| 79 |
--- a/m4/ax_lib_postgresql.m4 |
| 80 |
+++ b/m4/ax_lib_postgresql.m4 |
| 81 |
@@ -84,7 +84,8 @@ AC_DEFUN([AX_LIB_POSTGRESQL], |
| 82 |
AC_MSG_CHECKING([for PostgreSQL libraries]) |
| 83 |
|
| 84 |
POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" |
| 85 |
- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" |
| 86 |
+ POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" |
| 87 |
+ POSTGRESQL_LIBS="-lpq" |
| 88 |
|
| 89 |
POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` |
| 90 |
|
| 91 |
@@ -179,4 +180,5 @@ PQserverVersion(conn); |
| 92 |
AC_SUBST([POSTGRESQL_VERSION]) |
| 93 |
AC_SUBST([POSTGRESQL_CPPFLAGS]) |
| 94 |
AC_SUBST([POSTGRESQL_LDFLAGS]) |
| 95 |
+ AC_SUBST([POSTGRESQL_LIBS]) |
| 96 |
]) |
| 97 |
-- |
| 98 |
1.7.3.1 |
Archives