summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-06-17 17:04:55 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-06-17 17:04:55 +0000
commit379b303a5e933fbab41130adba6d16b5ad0368e8 (patch)
tree86a5b503dc83ddc09b780865ba1e5043e1323593 /sys-libs
parentRemoval request #324491, done as qcad was removed some time ago (diff)
downloadgentoo-2-379b303a5e933fbab41130adba6d16b5ad0368e8.tar.gz
gentoo-2-379b303a5e933fbab41130adba6d16b5ad0368e8.tar.bz2
gentoo-2-379b303a5e933fbab41130adba6d16b5ad0368e8.zip
Respect LDFLAGS. Fixes bug 323497. Thanks Andreis Vinogradovs <spamslepnoga@inbox.ru> for report. Committed with Patrick's blessing
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/talloc/ChangeLog7
-rw-r--r--sys-libs/talloc/files/talloc-2.0.1-respect-ldflags.patch15
-rw-r--r--sys-libs/talloc/talloc-2.0.1-r1.ebuild5
3 files changed, 24 insertions, 3 deletions
diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog
index 5992312d6df5..25690dcc8fec 100644
--- a/sys-libs/talloc/ChangeLog
+++ b/sys-libs/talloc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/talloc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.16 2010/06/05 18:41:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.17 2010/06/17 17:04:55 xarthisius Exp $
+
+ 17 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ talloc-2.0.1-r1.ebuild, +files/talloc-2.0.1-respect-ldflags.patch:
+ Respect LDFLAGS. Fixes bug 323497. Thanks Andreis Vinogradovs
+ <spamslepnoga@inbox.ru> for report.
05 Jun 2010; Raúl Porcel <armin76@gentoo.org> talloc-2.0.1-r1.ebuild:
alpha/arm/ia64/s390/sh/sparc stable wrt #300158
diff --git a/sys-libs/talloc/files/talloc-2.0.1-respect-ldflags.patch b/sys-libs/talloc/files/talloc-2.0.1-respect-ldflags.patch
new file mode 100644
index 000000000000..cf7f90673db2
--- /dev/null
+++ b/sys-libs/talloc/files/talloc-2.0.1-respect-ldflags.patch
@@ -0,0 +1,15 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=323497
+
+--- compat/talloc_compat1.mk
++++ compat/talloc_compat1.mk
+@@ -7,7 +7,7 @@
+ TALLOC_COMPAT1_SONAME = libtalloc.$(SHLIBEXT).$(TALLOC_COMPAT1_VERSION_MAJOR)
+
+ $(TALLOC_COMPAT1_SOLIB): $(TALLOC_COMPAT1_OBJ) $(TALLOC_SOLIB)
+- $(SHLD) $(SHLD_FLAGS) -o $@ $(TALLOC_COMPAT1_OBJ) \
++ $(SHLD) $(SHLD_FLAGS) $(LDFLAGS) -o $@ $(TALLOC_COMPAT1_OBJ) \
+ $(TALLOC_SOLIB) $(SONAMEFLAG)$(TALLOC_COMPAT1_SONAME)
+
+ all:: $(TALLOC_COMPAT1_SOLIB)
diff --git a/sys-libs/talloc/talloc-2.0.1-r1.ebuild b/sys-libs/talloc/talloc-2.0.1-r1.ebuild
index 5f70efef1ec0..c770bba1a1a8 100644
--- a/sys-libs/talloc/talloc-2.0.1-r1.ebuild
+++ b/sys-libs/talloc/talloc-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.1-r1.ebuild,v 1.5 2010/06/05 18:41:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.1-r1.ebuild,v 1.6 2010/06/17 17:04:55 xarthisius Exp $
EAPI="2"
@@ -23,7 +23,8 @@ DEPEND="doc? ( app-text/docbook-xml-dtd:4.2
!<net-fs/samba-3.3"
src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.0-without-doc.patch"
+ epatch "${FILESDIR}/${PN}-2.0.0-without-doc.patch" \
+ "${FILESDIR}"/${P}-respect-ldflags.patch
eautoconf -Ilibreplace