summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2005-10-08 11:53:38 +0000
committerSimon Stelling <blubb@gentoo.org>2005-10-08 11:53:38 +0000
commit4b5190a7de8561bea897a4789e6cc23a4551d60f (patch)
treec6b28e46c04e8a019f413a73cbad665751f6845b /dev-libs
parentFixed sse compile error issue. Bug 108460. (diff)
downloadhistorical-4b5190a7de8561bea897a4789e6cc23a4551d60f.tar.gz
historical-4b5190a7de8561bea897a4789e6cc23a4551d60f.tar.bz2
historical-4b5190a7de8561bea897a4789e6cc23a4551d60f.zip
keyword ~amd64 and make multilib-strict happy
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libnl/ChangeLog6
-rw-r--r--dev-libs/libnl/Manifest5
-rw-r--r--dev-libs/libnl/files/libnl-0.5.0-libdir.patch30
-rw-r--r--dev-libs/libnl/libnl-0.5.0.ebuild10
4 files changed, 44 insertions, 7 deletions
diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog
index 0d7e754b7476..15302e27459a 100644
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libnl
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.3 2005/09/18 15:39:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.4 2005/10/08 11:53:38 blubb Exp $
+
+ 08 Oct 2005; Simon Stelling <blubb@gentoo.org>
+ +files/libnl-0.5.0-libdir.patch, libnl-0.5.0.ebuild:
+ keyword ~amd64 and make multilib-strict happy
18 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org> libnl-0.5.0.ebuild:
Added ~ppc Keyword
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 33559e82d248..a4b190851bbd 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,5 +1,6 @@
-MD5 bc53d816b0a21951e19e946845f20620 libnl-0.5.0.ebuild 594
-MD5 9f3ba091fe351eb5869e50a2a375a13d ChangeLog 621
+MD5 739cebd2546f73f5f588bd29298c5afd ChangeLog 769
+MD5 e185ddc0b94afdd65448f30eb6591497 libnl-0.5.0.ebuild 680
MD5 5731c4fdc13f68a2dccaacfbc4fbc611 metadata.xml 257
MD5 9358c0ce8cc4782ae99aed88ac9abba1 files/digest-libnl-0.5.0 63
MD5 0eecf3acdb3d426c16ddfd7a398ed1a7 files/libnl-0.5.0-include.diff 364
+MD5 48894de8fc4dadc72e6475da87a5fe73 files/libnl-0.5.0-libdir.patch 1050
diff --git a/dev-libs/libnl/files/libnl-0.5.0-libdir.patch b/dev-libs/libnl/files/libnl-0.5.0-libdir.patch
new file mode 100644
index 000000000000..e9200ff54e02
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-0.5.0-libdir.patch
@@ -0,0 +1,30 @@
+--- lib/Makefile 2005-04-05 01:08:04.000000000 +0200
++++ lib/Makefile 2005-10-08 13:15:52.000000000 +0200
+@@ -22,6 +22,8 @@
+ include ../Makefile.opts
+ endif
+
++LIBDIR=$(prefix)/lib
++
+ # Core
+ CIN := $(wildcard *.c)
+ # NETLINK_ROUTE
+@@ -67,12 +69,12 @@
+ find .deps -iname \*\.d -exec rm -f '{}' \;
+
+ install:
+- mkdir -p $(DESTDIR)$(prefix)/lib/
+- install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib
+- rm -f $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) ; \
+- $(LN) -s $(DESTDIR)$(prefix)/lib/$(OUT_SLIB) $(DESTDIR)$(prefix)/lib/$(LN1_SLIB)
+- rm -f $(DESTDIR)$(prefix)/lib/$(LN_SLIB) ; \
+- $(LN) -s $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) $(DESTDIR)$(prefix)/lib/$(LN_SLIB)
++ mkdir -p $(DESTDIR)$(LIBDIR)/
++ install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
++ rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \
++ $(LN) -s $(DESTDIR)$(LIBDIR)/$(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB)
++ rm -f $(DESTDIR)$(LIBDIR)/$(LN_SLIB) ; \
++ $(LN) -s $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) $(DESTDIR)$(LIBDIR)/$(LN_SLIB)
+
+ $(DEPS): ../Makefile.opts
+
diff --git a/dev-libs/libnl/libnl-0.5.0.ebuild b/dev-libs/libnl/libnl-0.5.0.ebuild
index cb6844bf4f70..b4c9e52bc74d 100644
--- a/dev-libs/libnl/libnl-0.5.0.ebuild
+++ b/dev-libs/libnl/libnl-0.5.0.ebuild
@@ -1,22 +1,24 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-0.5.0.ebuild,v 1.3 2005/09/18 15:39:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-0.5.0.ebuild,v 1.4 2005/10/08 11:53:38 blubb Exp $
-inherit eutils
+inherit eutils multilib
DESCRIPTION="A library for applications dealing with netlink socket"
HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
src_unpack() {
unpack ${A}
+ cd ${S}
epatch "${FILESDIR}/${P}-include.diff"
+ epatch ${FILESDIR}/${P}-libdir.patch
}
src_install() {
- make DESTDIR="${D}" install || die
+ make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die
}