summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-12-08 19:50:00 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-12-08 19:50:00 +0000
commit66d2f3c765d22da6b13e9026d91e612e32e911f4 (patch)
tree61555e9048d1b8d66459472272e697b2a1808655 /app-admin
parentMarking tor-0.2.0.32 ppc64 for bug 250018 (diff)
downloadgentoo-2-66d2f3c765d22da6b13e9026d91e612e32e911f4.tar.gz
gentoo-2-66d2f3c765d22da6b13e9026d91e612e32e911f4.tar.bz2
gentoo-2-66d2f3c765d22da6b13e9026d91e612e32e911f4.zip
add patch from mastamind@users.sourceforge.net to avoid always trying to link
glib statically (bug #250242) (Portage version: 2.1.4.5)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/syslog-ng/ChangeLog7
-rw-r--r--app-admin/syslog-ng/files/syslog-ng-2.1.3-nonstatic.patch12
-rw-r--r--app-admin/syslog-ng/syslog-ng-2.1.3.ebuild3
3 files changed, 20 insertions, 2 deletions
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index 8648c571b0ca..8aece7d75b72 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/syslog-ng
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.191 2008/12/02 21:57:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.192 2008/12/08 19:50:00 mr_bones_ Exp $
+
+ 08 Dec 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/syslog-ng-2.1.3-nonstatic.patch, syslog-ng-2.1.3.ebuild:
+ add patch from mastamind@users.sourceforge.net to avoid always trying to link
+ glib statically (bug #250242)
02 Dec 2008; Michael Sterrett <mr_bones_@gentoo.org>
-syslog-ng-2.0.6.ebuild, -syslog-ng-2.1.1.ebuild:
diff --git a/app-admin/syslog-ng/files/syslog-ng-2.1.3-nonstatic.patch b/app-admin/syslog-ng/files/syslog-ng-2.1.3-nonstatic.patch
new file mode 100644
index 000000000000..9919ba5f1d6c
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-2.1.3-nonstatic.patch
@@ -0,0 +1,12 @@
+diff -NaurwB syslog-ng-2.1.3.orig/configure.in syslog-ng-2.1.3/configure.in
+--- syslog-ng-2.1.3.orig/configure.in 2008-11-19 14:00:11.000000000 +0100
++++ syslog-ng-2.1.3/configure.in 2008-12-08 01:54:21.000000000 +0100
+@@ -466,7 +466,7 @@
+ elif test "x$enable_static_linking" = "xyes"; then
+ DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"
+ else
+- DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
++ DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $LD_END_STATIC $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
+ fi
+ LIBS="$DEPS_LIBS"
+ YFLAGS="-d"
diff --git a/app-admin/syslog-ng/syslog-ng-2.1.3.ebuild b/app-admin/syslog-ng/syslog-ng-2.1.3.ebuild
index a903b26611d0..8f66d396c542 100644
--- a/app-admin/syslog-ng/syslog-ng-2.1.3.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-2.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.1.3.ebuild,v 1.1 2008/12/02 19:27:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.1.3.ebuild,v 1.2 2008/12/08 19:50:00 mr_bones_ Exp $
inherit fixheadtails eutils
@@ -30,6 +30,7 @@ src_unpack() {
tar xzf syslog-ng.html.tar.gz || die "tar failed"
cd "${S}"
ht_fix_file configure
+ epatch "${FILESDIR}/${P}-nonstatic.patch"
}
src_compile() {