1 |
alonbl 07/10/10 19:10:31 |
2 |
|
3 |
Modified: libx86-0.99-build.patch |
4 |
Log: |
5 |
Fix lib dir, bug#192814, thanks for Pacho Ramos for reporting |
6 |
(Portage version: 2.1.3.12) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-libs/libx86/files/libx86-0.99-build.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libx86/files/libx86-0.99-build.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libx86/files/libx86-0.99-build.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libx86/files/libx86-0.99-build.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: libx86-0.99-build.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libx86/files/libx86-0.99-build.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- libx86-0.99-build.patch 17 Sep 2007 13:03:56 -0000 1.1 |
22 |
+++ libx86-0.99-build.patch 10 Oct 2007 19:10:30 -0000 1.2 |
23 |
@@ -1,16 +1,25 @@ |
24 |
---- Makefile.org 2007-09-14 01:04:56.000000000 +0300 |
25 |
-+++ Makefile 2007-09-14 01:06:07.000000000 +0300 |
26 |
-@@ -1,5 +1,5 @@ |
27 |
+diff -urNp libx86-0.99.org/Makefile libx86-0.99/Makefile |
28 |
+--- libx86-0.99.org/Makefile 2006-10-30 02:14:18.000000000 +0200 |
29 |
++++ libx86-0.99/Makefile 2007-10-10 21:05:34.000000000 +0200 |
30 |
+@@ -1,5 +1,8 @@ |
31 |
OBJECTS = x86-common.o |
32 |
-CFLAGS = -O2 -Wall -DDEBUG -g |
33 |
+CFLAGS ?= -O2 -Wall -DDEBUG -g |
34 |
++PREFIX ?= /usr |
35 |
++LIBDIR ?= $(PREFIX)/lib |
36 |
++INCDIR ?= $(PREFIX)/include |
37 |
|
38 |
ifeq ($(BACKEND), x86emu) |
39 |
OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ |
40 |
-@@ -33,5 +33,5 @@ clean: objclean |
41 |
+@@ -31,7 +34,7 @@ clean: objclean |
42 |
+ rm -f *.so.1 *.a |
43 |
+ |
44 |
install: libx86.so.1 |
45 |
- install -D libx86.so.1 $(DESTDIR)/usr/lib/libx86.so.1 |
46 |
- install -D libx86.a $(DESTDIR)/usr/lib/libx86.a |
47 |
+- install -D libx86.so.1 $(DESTDIR)/usr/lib/libx86.so.1 |
48 |
+- install -D libx86.a $(DESTDIR)/usr/lib/libx86.a |
49 |
- ln -sf /usr/lib/libx86.so.1 $(DESTDIR)/usr/lib/libx86.so |
50 |
-+ ln -sf libx86.so.1 $(DESTDIR)/usr/lib/libx86.so |
51 |
- install -D lrmi.h $(DESTDIR)/usr/include/libx86.h |
52 |
+- install -D lrmi.h $(DESTDIR)/usr/include/libx86.h |
53 |
++ install -D libx86.so.1 $(DESTDIR)/$(LIBDIR)/libx86.so.1 |
54 |
++ install -D libx86.a $(DESTDIR)/$(LIBDIR)/libx86.a |
55 |
++ ln -sf libx86.so.1 $(DESTDIR)/$(LIBDIR)/libx86.so |
56 |
++ install -D lrmi.h $(DESTDIR)/$(INCDIR)/libx86.h |
57 |
|
58 |
|
59 |
|
60 |
-- |
61 |
gentoo-commits@g.o mailing list |