diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2010-08-20 13:10:18 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2010-08-20 13:10:18 +0000 |
| commit | 32ae544356aa5015d4430a6a2a4e938bcfafd056 (patch) | |
| tree | 03a0051e9dc1f98f2b89f2b6c069b13aff65e5d5 /sys-libs/lrmi | |
| parent | old (diff) | |
| download | gentoo-2-32ae544356aa5015d4430a6a2a4e938bcfafd056.tar.gz gentoo-2-32ae544356aa5015d4430a6a2a4e938bcfafd056.tar.bz2 gentoo-2-32ae544356aa5015d4430a6a2a4e938bcfafd056.zip | |
Respect LDFLAGS (bug #331913).
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/lrmi')
| -rw-r--r-- | sys-libs/lrmi/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/lrmi/files/lrmi-0.10-ldflags.patch | 26 | ||||
| -rw-r--r-- | sys-libs/lrmi/lrmi-0.10-r1.ebuild | 7 |
3 files changed, 36 insertions, 5 deletions
diff --git a/sys-libs/lrmi/ChangeLog b/sys-libs/lrmi/ChangeLog index 36b90e747d0e..2eaa7f54f368 100644 --- a/sys-libs/lrmi/ChangeLog +++ b/sys-libs/lrmi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/lrmi -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.22 2008/12/08 20:57:55 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/ChangeLog,v 1.23 2010/08/20 13:10:18 spock Exp $ + + 20 Aug 2010; Michał Januszewski <spock@gentoo.org> lrmi-0.10-r1.ebuild, + +files/lrmi-0.10-ldflags.patch: + Respect LDFLAGS (bug #331913). 08 Dec 2008; <ssuominen@gentoo.org> lrmi-0.10-r1.ebuild: Respect AR, CC and RANLIB. diff --git a/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch b/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch new file mode 100644 index 000000000000..b23bd9c5cdf8 --- /dev/null +++ b/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch @@ -0,0 +1,26 @@ +diff -Naurp lrmi-0.10-orig/Makefile lrmi-0.10/Makefile +--- lrmi-0.10-orig/Makefile 2010-08-20 15:03:17.093144820 +0200 ++++ lrmi-0.10/Makefile 2010-08-20 15:03:47.761144267 +0200 +@@ -2,6 +2,7 @@ LIBDIR ?= /usr/local/lib + INCDIR ?= /usr/local/include + + CFLAGS = -g -Wall ++LDFLAGS = + + sources = lrmi.c + objects = lrmi.o +@@ -26,12 +27,12 @@ liblrmi.a: $(objects) + + liblrmi.so: $(pic_objects) + # $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $^ +- $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ ++ $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) $(LDFLAGS) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ + ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) + ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so + + vbetest: vbetest.c liblrmi.a +- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + install: + mkdir -p $(LIBDIR) diff --git a/sys-libs/lrmi/lrmi-0.10-r1.ebuild b/sys-libs/lrmi/lrmi-0.10-r1.ebuild index 418a0451c138..84df7e5273ff 100644 --- a/sys-libs/lrmi/lrmi-0.10-r1.ebuild +++ b/sys-libs/lrmi/lrmi-0.10-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.4 2008/12/08 20:57:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.5 2010/08/20 13:10:18 spock Exp $ inherit eutils toolchain-funcs @@ -17,11 +17,12 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-kernel-2.6.26.patch + epatch "${FILESDIR}"/${P}-ldflags.patch } src_compile() { tc-export CC AR RANLIB - emake CFLAGS="${CFLAGS} -Wall" || die "emake failed." + emake CFLAGS="${CFLAGS} -Wall" LDFLAGS="${LDFLAGS}" || die "emake failed." } src_install() { |