summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2007-10-10 19:10:30 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2007-10-10 19:10:30 +0000
commitc10639252a418d805e0449587cb105bcebd3652c (patch)
treef5d94bbec7150500aabca1b4a03a992b83a682da /dev-libs/libx86
parentRemove old, fix parallel install, bug 188759 thanks to Arthur Hagen <art-gt@b... (diff)
downloadhistorical-c10639252a418d805e0449587cb105bcebd3652c.tar.gz
historical-c10639252a418d805e0449587cb105bcebd3652c.tar.bz2
historical-c10639252a418d805e0449587cb105bcebd3652c.zip
Fix lib dir, bug#192814, thanks for Pacho Ramos for reporting
Package-Manager: portage-2.1.3.12
Diffstat (limited to 'dev-libs/libx86')
-rw-r--r--dev-libs/libx86/ChangeLog6
-rw-r--r--dev-libs/libx86/Manifest24
-rw-r--r--dev-libs/libx86/files/libx86-0.99-build.patch25
-rw-r--r--dev-libs/libx86/libx86-0.99.ebuild6
4 files changed, 37 insertions, 24 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/Manifest b/dev-libs/libx86/Manifest
index 3a7531949990..963b9d464ed2 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -1,16 +1,16 @@
-AUX libx86-0.99-build.patch 624 RMD160 2393315feebea3955102b84642bd9789611dfe36 SHA1 dd07108d419909cf7a868af2ae15156234161b00 SHA256 1718af1de90aa5c68c4f2536a0a68b10feee70dd57640e28252a4a2dd458c72a
-MD5 e6169b34cb163718c2080a7268e6bd8f files/libx86-0.99-build.patch 624
-RMD160 2393315feebea3955102b84642bd9789611dfe36 files/libx86-0.99-build.patch 624
-SHA256 1718af1de90aa5c68c4f2536a0a68b10feee70dd57640e28252a4a2dd458c72a files/libx86-0.99-build.patch 624
+AUX libx86-0.99-build.patch 958 RMD160 f952be3ff8eaf85381bd08a8651d754af36fa5eb SHA1 dea293e7faac65f66381c42702f5ef34ca82d95d SHA256 3371e4309be8d5627d1f54257c4b06db3856a9c6c1d1d975d89a1d7564275ec2
+MD5 275cc69875d5d5272c95ec60561ddf2f files/libx86-0.99-build.patch 958
+RMD160 f952be3ff8eaf85381bd08a8651d754af36fa5eb files/libx86-0.99-build.patch 958
+SHA256 3371e4309be8d5627d1f54257c4b06db3856a9c6c1d1d975d89a1d7564275ec2 files/libx86-0.99-build.patch 958
DIST libx86-0.99.tar.gz 100534 RMD160 099b4a24842dde578078108ddc7e431402e31727 SHA1 53e44a87dc57a17b2f54fec57d636f577d3c75c1 SHA256 fdaac661dab2845beb5546e43e71ee02d9bf3c04bc623b64e0b124f1da26f546
-EBUILD libx86-0.99.ebuild 738 RMD160 5e8e061a521c59d980e8bdc1aa9e56f28f57e8a2 SHA1 0c861aa3620d020230c8e92209a8e1cfca726cee SHA256 00dece77bae4fcc36e21823e88259a3ca8779e6db14b75c2faf9f0fa7a397f7b
-MD5 95bd709d50b74c524551007670349238 libx86-0.99.ebuild 738
-RMD160 5e8e061a521c59d980e8bdc1aa9e56f28f57e8a2 libx86-0.99.ebuild 738
-SHA256 00dece77bae4fcc36e21823e88259a3ca8779e6db14b75c2faf9f0fa7a397f7b libx86-0.99.ebuild 738
-MISC ChangeLog 472 RMD160 bad77bec548fc1a3c5746ef67edc930b588f0954 SHA1 589d2cd4c2a992bf2fe3735a98d59e9372e6fc6d SHA256 1ede95e1b2fcf43aeeb77636850fc70bd81d920c8cd7beb014a0ca32acd4cd3e
-MD5 f784072ece77cb4f6d0e47e4c8fd655f ChangeLog 472
-RMD160 bad77bec548fc1a3c5746ef67edc930b588f0954 ChangeLog 472
-SHA256 1ede95e1b2fcf43aeeb77636850fc70bd81d920c8cd7beb014a0ca32acd4cd3e ChangeLog 472
+EBUILD libx86-0.99.ebuild 775 RMD160 ca8d59fa19abbae673364e17234073b8abde3b77 SHA1 d81c2b8cfdb931c9cbd2e3ae87a4aab83a36173c SHA256 e4e42400d97fdf3466c5279d64771b6beb0d5c7f9b12f2fafe7076b3f6ce2923
+MD5 4606aca51d7b1e86766d9235c5cdd5c5 libx86-0.99.ebuild 775
+RMD160 ca8d59fa19abbae673364e17234073b8abde3b77 libx86-0.99.ebuild 775
+SHA256 e4e42400d97fdf3466c5279d64771b6beb0d5c7f9b12f2fafe7076b3f6ce2923 libx86-0.99.ebuild 775
+MISC ChangeLog 638 RMD160 cf9cacfd4242beb62599569cd2e5a17dbdd38fd3 SHA1 98dfeb12b3da9e8715384ff9540cd11d029342ed SHA256 946556a06f3e68e259621fdbaf0d1835f84495ccfec86e4cfc2acb8f21cbfd0d
+MD5 d3ac39bd1fd5f8e717de4cd644e021c7 ChangeLog 638
+RMD160 cf9cacfd4242beb62599569cd2e5a17dbdd38fd3 ChangeLog 638
+SHA256 946556a06f3e68e259621fdbaf0d1835f84495ccfec86e4cfc2acb8f21cbfd0d ChangeLog 638
MISC metadata.xml 244 RMD160 ce7edb43541cf508d100696e28922e8df352109b SHA1 d6a2711e10c27157d4b4948a6c863cbd9f242ce8 SHA256 4bf1c89dd387bb1720923df0cdc0f19a5388b06a2cf17ae119399731b4088b71
MD5 5b31577adfb6570533b634c63a23dc51 metadata.xml 244
RMD160 ce7edb43541cf508d100696e28922e8df352109b metadata.xml 244
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
}