From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17AC7139085 for ; Tue, 17 Jan 2017 22:54:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EEE0E0E49; Tue, 17 Jan 2017 22:54:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E928E0E49 for ; Tue, 17 Jan 2017 22:54:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 266EA341236 for ; Tue, 17 Jan 2017 22:54:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96675265F for ; Tue, 17 Jan 2017 22:54:29 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1484693598.325a6e2851b3204831e18d1eddd2bf0aa3037e55.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch X-VCS-Directories: net-analyzer/zabbix/files/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 325a6e2851b3204831e18d1eddd2bf0aa3037e55 X-VCS-Branch: master Date: Tue, 17 Jan 2017 22:54:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 56b5ec3d-eb05-44e2-93c1-952c824b9d62 X-Archives-Hash: 82bf5e77f4ecb171878858d0f5685b71 commit: 325a6e2851b3204831e18d1eddd2bf0aa3037e55 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Mon Jan 16 18:07:47 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Tue Jan 17 22:53:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325a6e28 net-analyzer/zabbix: remove unused patch. Closes: https://github.com/gentoo/gentoo/pull/3510 .../zabbix/files/zabbix-1.8.9-as-needed.patch | 83 ---------------------- 1 file changed, 83 deletions(-) diff --git a/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch b/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch deleted file mode 100644 index 254634d..00000000 --- a/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 90b086b4daebf61756e3d6f8926cf8951a2fc96a Mon Sep 17 00:00:00 2001 -From: Vladimir V. Kamarzin -Date: Fri, 22 Oct 2010 17:47:01 +0600 -Subject: [PATCH 1/2] Fix linking with ldap libs - -Move "-lldap -llber" from LDAP_LDFLAGS to LDAP_LIBS and include them to -LIBS ---- - configure.in | 1 + - m4/ldap.m4 | 4 +++- - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index d3d981b..b11b2ee 100644 ---- a/configure.in -+++ b/configure.in -@@ -1281,6 +1281,7 @@ if test "x$want_ldap" = "xyes"; then - fi - CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" - SERVER_LDFLAGS="${SERVER_LDFLAGS} ${LDAP_LDFLAGS}" -+LIBS="${LIBS} ${LDAP_LIBS}" - PROXY_LDFLAGS="${PROXY_LDFLAGS} ${LDAP_LDFLAGS}" - AGENT_LDFLAGS="${AGENT_LDFLAGS} ${LDAP_LDFLAGS}" - - found_iconv="no" - dnl Check for libiconv [by default - skip] -diff --git a/m4/ldap.m4 b/m4/ldap.m4 -index 29e97cd..885b3e0 100644 ---- a/m4/ldap.m4 -+++ b/m4/ldap.m4 -@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> - fi - - LDAP_CPPFLAGS=-I$LDAP_INCDIR -- LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS" -+ LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS" -+ 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@:>@],[Include LDAP support @<:@default=no@:> - - AC_SUBST(LDAP_CPPFLAGS) - AC_SUBST(LDAP_LDFLAGS) -+ AC_SUBST(LDAP_LIBS) - - unset _libldap_with - ])dnl --- -1.7.3.1 - -From f6378e6aeb0bec1883a83c70c8cdfd1213f11f97 Mon Sep 17 00:00:00 2001 -From: Vladimir V. Kamarzin -Date: Fri, 22 Oct 2010 17:49:16 +0600 -Subject: [PATCH 2/2] m4/ax_lib_postgresql.m4: move -pq from POSTGRESQL_LDFLAGS to POSTGRESQL_LIBS - ---- - m4/ax_lib_postgresql.m4 | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 -index fe06f66..934d12c 100644 ---- a/m4/ax_lib_postgresql.m4 -+++ b/m4/ax_lib_postgresql.m4 -@@ -84,7 +84,8 @@ AC_DEFUN([AX_LIB_POSTGRESQL], - AC_MSG_CHECKING([for PostgreSQL libraries]) - - POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" -- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" -+ POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" -+ POSTGRESQL_LIBS="-lpq" - - POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` - -@@ -179,4 +180,5 @@ PQserverVersion(conn); - AC_SUBST([POSTGRESQL_VERSION]) - AC_SUBST([POSTGRESQL_CPPFLAGS]) - AC_SUBST([POSTGRESQL_LDFLAGS]) -+ AC_SUBST([POSTGRESQL_LIBS]) - ]) --- -1.7.3.1 -