diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2007-10-10 19:10:30 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2007-10-10 19:10:30 +0000 |
| commit | f7fd40e64a5e9517e613878ae31b4b0f89158dec (patch) | |
| tree | b023be9f0dabf258bcc87740d1dad2752588fb07 /dev-libs | |
| parent | Remove old, fix parallel install, bug 188759 thanks to Arthur Hagen <art-gt@b... (diff) | |
| download | gentoo-2-f7fd40e64a5e9517e613878ae31b4b0f89158dec.tar.gz gentoo-2-f7fd40e64a5e9517e613878ae31b4b0f89158dec.tar.bz2 gentoo-2-f7fd40e64a5e9517e613878ae31b4b0f89158dec.zip | |
Fix lib dir, bug#192814, thanks for Pacho Ramos for reporting
(Portage version: 2.1.3.12)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libx86/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libx86/files/libx86-0.99-build.patch | 25 | ||||
| -rw-r--r-- | dev-libs/libx86/libx86-0.99.ebuild | 6 |
3 files changed, 25 insertions, 12 deletions
diff --git a/dev-libs/libx86/ChangeLog b/dev-libs/libx86/ChangeLog index 24e8feb67ec9..b44c606be492 100644 --- a/dev-libs/libx86/ChangeLog +++ b/dev-libs/libx86/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libx86 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.2 2007/09/18 19:46:46 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.3 2007/10/10 19:10:30 alonbl Exp $ + + 10 Oct 2007; Alon Bar-Lev <alonbl@gentoo.org> + files/libx86-0.99-build.patch, libx86-0.99.ebuild: + Fix lib dir, bug#192814, thanks for Pacho Ramos for reporting 18 Sep 2007; Alon Bar-Lev <alonbl@gentoo.org> libx86-0.99.ebuild: Add die thanks to vapier diff --git a/dev-libs/libx86/files/libx86-0.99-build.patch b/dev-libs/libx86/files/libx86-0.99-build.patch index c16156638369..80d2a8297499 100644 --- a/dev-libs/libx86/files/libx86-0.99-build.patch +++ b/dev-libs/libx86/files/libx86-0.99-build.patch @@ -1,16 +1,25 @@ ---- Makefile.org 2007-09-14 01:04:56.000000000 +0300 -+++ Makefile 2007-09-14 01:06:07.000000000 +0300 -@@ -1,5 +1,5 @@ +diff -urNp libx86-0.99.org/Makefile libx86-0.99/Makefile +--- libx86-0.99.org/Makefile 2006-10-30 02:14:18.000000000 +0200 ++++ libx86-0.99/Makefile 2007-10-10 21:05:34.000000000 +0200 +@@ -1,5 +1,8 @@ OBJECTS = x86-common.o -CFLAGS = -O2 -Wall -DDEBUG -g +CFLAGS ?= -O2 -Wall -DDEBUG -g ++PREFIX ?= /usr ++LIBDIR ?= $(PREFIX)/lib ++INCDIR ?= $(PREFIX)/include ifeq ($(BACKEND), x86emu) OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ -@@ -33,5 +33,5 @@ clean: objclean +@@ -31,7 +34,7 @@ clean: objclean + rm -f *.so.1 *.a + install: libx86.so.1 - install -D libx86.so.1 $(DESTDIR)/usr/lib/libx86.so.1 - install -D libx86.a $(DESTDIR)/usr/lib/libx86.a +- install -D libx86.so.1 $(DESTDIR)/usr/lib/libx86.so.1 +- install -D libx86.a $(DESTDIR)/usr/lib/libx86.a - ln -sf /usr/lib/libx86.so.1 $(DESTDIR)/usr/lib/libx86.so -+ ln -sf libx86.so.1 $(DESTDIR)/usr/lib/libx86.so - install -D lrmi.h $(DESTDIR)/usr/include/libx86.h +- install -D lrmi.h $(DESTDIR)/usr/include/libx86.h ++ install -D libx86.so.1 $(DESTDIR)/$(LIBDIR)/libx86.so.1 ++ install -D libx86.a $(DESTDIR)/$(LIBDIR)/libx86.a ++ ln -sf libx86.so.1 $(DESTDIR)/$(LIBDIR)/libx86.so ++ install -D lrmi.h $(DESTDIR)/$(INCDIR)/libx86.h diff --git a/dev-libs/libx86/libx86-0.99.ebuild b/dev-libs/libx86/libx86-0.99.ebuild index 1a4df7afa1aa..758806b8f12e 100644 --- a/dev-libs/libx86/libx86-0.99.ebuild +++ b/dev-libs/libx86/libx86-0.99.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-0.99.ebuild,v 1.2 2007/09/18 19:46:46 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-0.99.ebuild,v 1.3 2007/10/10 19:10:30 alonbl Exp $ -inherit eutils +inherit eutils multilib DESCRIPTION="A hardware-independent library for executing real-mode x86 code" HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86" @@ -31,5 +31,5 @@ src_compile() { } src_install() { - emake install DESTDIR="${D}" || die + emake install LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" || die } |