summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2010-08-20 13:10:18 +0000
committerMichael Januszewski <spock@gentoo.org>2010-08-20 13:10:18 +0000
commit78b0a11a4cd13fe7fb747a8abc7eaedb48b4fca2 (patch)
tree5eab204f313d5df5c94b1139fa173bdb5d07b49f /sys-libs/lrmi
parentold (diff)
downloadhistorical-78b0a11a4cd13fe7fb747a8abc7eaedb48b4fca2.tar.gz
historical-78b0a11a4cd13fe7fb747a8abc7eaedb48b4fca2.tar.bz2
historical-78b0a11a4cd13fe7fb747a8abc7eaedb48b4fca2.zip
Respect LDFLAGS (bug #331913).
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/lrmi')
-rw-r--r--sys-libs/lrmi/ChangeLog8
-rw-r--r--sys-libs/lrmi/Manifest15
-rw-r--r--sys-libs/lrmi/files/lrmi-0.10-ldflags.patch26
-rw-r--r--sys-libs/lrmi/lrmi-0.10-r1.ebuild7
4 files changed, 49 insertions, 7 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/Manifest b/sys-libs/lrmi/Manifest
index 1383a9461f02..a43ace6b6cbe 100644
--- a/sys-libs/lrmi/Manifest
+++ b/sys-libs/lrmi/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX lrmi-0.10-kernel-2.6.26.patch 593 RMD160 a30d5164643be00dfcb2e45623aaa7626c25f1d2 SHA1 d00ea0857bbef88425bee9928a1b28b9fd5193a2 SHA256 44249d94d58bcac734683c3a15b5b9bcefc815b7aa4df1e053172e90c3c3ab9d
+AUX lrmi-0.10-ldflags.patch 934 RMD160 c823c5561dd22199ea79d210e7d7ec22c8f283fe SHA1 35b7bda894a48bd6b143f506a304b8dc7550b7fe SHA256 0df1dbe616c8236666f0bb19b812cf38a1cb3a871613f710ccdf6e1e8f7696a6
DIST lrmi-0.10.tar.gz 10271 RMD160 3805b41fd2a558ec145991c30a7f88101af48f1c SHA1 1495b3c2f3613979eb0396fd99a8e5e52d53ec80 SHA256 b0be55c14407f586dc10836e8f348b3a002c461a9b47a302071eac0ef85770da
-EBUILD lrmi-0.10-r1.ebuild 974 RMD160 914d086a95888a4357c17365f898c08dee3235f3 SHA1 259f258a3bba9e4ea07d14cac3145691c126b4bb SHA256 ba762342612c55c42ab31cf01260bb96876c003cc9a6b55510e6c37871f9fc12
-MISC ChangeLog 2422 RMD160 8f6512f30b4930b35caba07b34d031fe9a1764fa SHA1 56547ab7071a673595c5b3630ee7677daf03b94e SHA256 14819b57ab91e27240e975cbb7ee0d538e3145afd4929213451bc5f66fb489f2
+EBUILD lrmi-0.10-r1.ebuild 1032 RMD160 b34997d3bafb9780bae294f591147b9f81fc1d30 SHA1 7e90a40b6c5ebfbb715bfaec14d1ac8f12efbfad SHA256 dc6ff5458e89a1e3a119b8beb1277e0b86bb6598368953b610810766709569c8
+MISC ChangeLog 2561 RMD160 cfca4296656c2465cab77e8c60fc6ca9cc5b46ef SHA1 d788af35117725f7beec7f5095b0cbff427bddb4 SHA256 c55245b13fbd8b97955166a5c05657293a8e93d0de947c4e560bc1ade5640206
MISC metadata.xml 224 RMD160 feb568b578b888bb1a208ef3c1302c877d5b7fb7 SHA1 bcce7e3df01f53ecf5e01edd7a39772dec9cc45f SHA256 4faffbdf0669222627d57d9614686ffe729da609af533c4dbd394682b2668e30
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxufsQACgkQchej4aZK9/ejfgCeLciskyo4bwpPSp6eVfVJxoC3
+v4YAnjaxwbaLkvluhvwuw2fpOzyBbn/m
+=MPPk
+-----END PGP SIGNATURE-----
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() {