summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-03-22 20:29:20 +0000
committerJustin Lecher <jlec@gentoo.org>2010-03-22 20:29:20 +0000
commit30d3e1539425e94fdce90ba0b6c55da9e949ef5b (patch)
treec9ce23bc7843d2483c8faceae4208dd4bb9aec1d /app-admin/moodss
parentVersion bump and cleaning old testing version (diff)
downloadgentoo-2-30d3e1539425e94fdce90ba0b6c55da9e949ef5b.tar.gz
gentoo-2-30d3e1539425e94fdce90ba0b6c55da9e949ef5b.tar.bz2
gentoo-2-30d3e1539425e94fdce90ba0b6c55da9e949ef5b.zip
Respecting CC and LDFLAGS per 247193
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/moodss')
-rw-r--r--app-admin/moodss/ChangeLog8
-rw-r--r--app-admin/moodss/files/21.5-ldflags.patch18
-rw-r--r--app-admin/moodss/moodss-21.5.ebuild13
3 files changed, 32 insertions, 7 deletions
diff --git a/app-admin/moodss/ChangeLog b/app-admin/moodss/ChangeLog
index bc72ad3b80d0..8a063c0e6800 100644
--- a/app-admin/moodss/ChangeLog
+++ b/app-admin/moodss/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/moodss
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/ChangeLog,v 1.14 2009/08/14 00:52:06 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/ChangeLog,v 1.15 2010/03/22 20:29:19 jlec Exp $
+
+ 22 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+ +files/21.5-ldflags.patch, moodss-21.5.ebuild:
+ Respecting CC and LDFLAGS per 247193
14 Aug 2009; Christian Faulhammer <fauli@gentoo.org> moodss-21.5.ebuild:
port to EAPI 2
diff --git a/app-admin/moodss/files/21.5-ldflags.patch b/app-admin/moodss/files/21.5-ldflags.patch
new file mode 100644
index 000000000000..cd18aabe162b
--- /dev/null
+++ b/app-admin/moodss/files/21.5-ldflags.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index c0a2200..b058a68 100644
+--- a/Makefile
++++ b/Makefile
+@@ -167,10 +167,10 @@ libtclstub.a::
+ rm -f $@; test -f $$LIBRARY && ln -s $$LIBRARY $@ || ln -s $(TCLLIBDIR)/$@ $@
+
+ packlibs/libfilesystem.so.1.1: packlibs/filesystem.c libtclstub.a
+- $(CC) -shared -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
++ $(CC) -shared $(LDFLAGS) -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
+
+ packlibs/libnetwork.so.1.23: packlibs/network.c libtclstub.a
+- $(CC) -shared -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $? $(EXTRALIBS)
++ $(CC) -shared $(LDFLAGS) -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $? $(EXTRALIBS)
+
+ packlibs/liblogging.so.1.0: packlibs/logging.c libtclstub.a
+- $(CC) -shared -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
++ $(CC) -shared $(LDFLAGS) -fPIC -DUSE_TCL_STUBS $(CFLAGS) $(INCLUDES) -o $@ $?
diff --git a/app-admin/moodss/moodss-21.5.ebuild b/app-admin/moodss/moodss-21.5.ebuild
index 47159c4dad52..ca2fbe65eea5 100644
--- a/app-admin/moodss/moodss-21.5.ebuild
+++ b/app-admin/moodss/moodss-21.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.2 2009/08/14 00:52:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.3 2010/03/22 20:29:19 jlec Exp $
-EAPI=2
+EAPI="3"
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
DESCRIPTION="Modular Object Oriented Dynamic SpreadSheet"
HOMEPAGE="http://moodss.sourceforge.net/"
@@ -37,10 +37,13 @@ src_prepare() {
sed -i -e 's:%_datadir:/usr/share:' \
-e 's:%_bindir:/usr/bin:' ${PN}.desktop || die
sed -i -e "s:/usr/lib:/usr/$(get_libdir):" Makefile || die
+ epatch "${FILESDIR}"/${PV}-ldflags.patch
}
src_compile() {
- emake CFLAGS="${CFLAGS}" || die
+ emake \
+ CFLAGS="${CFLAGS}" \
+ CC="$(tc-getCC)" || die
}
src_install() {