summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2011-09-09 14:15:30 +0000
committerNaohiro Aota <naota@gentoo.org>2011-09-09 14:15:30 +0000
commit3628b619a5a9669994f635b7da65b8338f6f78e8 (patch)
treecff6b380e6c3eb98afde88ccfc5ab6ff1436c1d9 /dev-libs/libmoe
parentRestore ChangeLog thanks to radhermit. (diff)
downloadgentoo-2-3628b619a5a9669994f635b7da65b8338f6f78e8.tar.gz
gentoo-2-3628b619a5a9669994f635b7da65b8338f6f78e8.tar.bz2
gentoo-2-3628b619a5a9669994f635b7da65b8338f6f78e8.zip
Add patch to set LDFLAGS. Bug #335802
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libmoe')
-rw-r--r--dev-libs/libmoe/ChangeLog8
-rw-r--r--dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch23
-rw-r--r--dev-libs/libmoe/libmoe-1.5.8-r2.ebuild5
3 files changed, 32 insertions, 4 deletions
diff --git a/dev-libs/libmoe/ChangeLog b/dev-libs/libmoe/ChangeLog
index c10553187d16..bcaef8dd38d8 100644
--- a/dev-libs/libmoe/ChangeLog
+++ b/dev-libs/libmoe/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libmoe
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmoe/ChangeLog,v 1.22 2010/03/23 20:36:10 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmoe/ChangeLog,v 1.23 2011/09/09 14:15:30 naota Exp $
+
+ 09 Sep 2011; Naohiro Aota <naota@gentoo.org> libmoe-1.5.8-r2.ebuild,
+ +files/libmoe-1.5.8-makefile.patch:
+ Add patch to set LDFLAGS. Bug #335802
23 Mar 2010; Brent Baude <ranger@gentoo.org> libmoe-1.5.8-r2.ebuild:
stable ppc, bug 302326
diff --git a/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch b/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch
new file mode 100644
index 000000000000..2cdfa1a24c22
--- /dev/null
+++ b/dev-libs/libmoe/files/libmoe-1.5.8-makefile.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 1bae380..605d674 100644
+--- a/Makefile
++++ b/Makefile
+@@ -72,8 +72,7 @@ AR=ar
+ all: ${INSTLIBA} mbconv mbconv.man
+
+ mbconv: mbconv.c ${ALL}
+- ${CC} ${CF} -o $@ $< -L. -lmoe
+-
++ ${CC} ${CF} ${LDFLAGS} -o $@ $< -L. -lmoe
+
+ ${DEST}.so: ${DEST}.so.${VER}.${RELEASE}
+ ln -sf $< $@
+@@ -116,7 +115,7 @@ ${BTRI_Cs}: %.c: %.mk_btri.c mk_btri
+ ./mk_btri <$< >$@-new && mv $@-new $@
+
+ mk_btri: btri.c btri.h altmalloc.o
+- ${CC} ${CF} -DMAIN -o $@ $< altmalloc.o
++ ${CC} ${CF} ${LDFLAGS} -DMAIN -o $@ $< altmalloc.o
+
+ mbconv.man: mbconv.pod
+ pod2man --section=${MANSECT} --center=' ' $< >$@
diff --git a/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild
index ba2a91a234a8..07cdba7fd399 100644
--- a/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild
+++ b/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild,v 1.4 2010/03/23 20:36:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmoe/libmoe-1.5.8-r2.ebuild,v 1.5 2011/09/09 14:15:30 naota Exp $
inherit eutils multilib toolchain-funcs
@@ -20,6 +20,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${P}-makefile.patch"
sed -i \
-e "/^PREFIX=/s:=.*:=/usr:" \