| 1 |
spock 08/09/27 20:02:33 |
| 2 |
|
| 3 |
Added: v86d-0.1.8-concurrent-make.patch |
| 4 |
Log: |
| 5 |
Fix concurrent build of v86d (bugs #238506, #238714). |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc6 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: v86d-0.1.8-concurrent-make.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naurp v86d-0.1.8-orig/Makefile v86d-0.1.8/Makefile |
| 17 |
--- v86d-0.1.8-orig/Makefile 2008-09-27 21:52:56.000000000 +0200 |
| 18 |
+++ v86d-0.1.8/Makefile 2008-09-27 21:53:50.000000000 +0200 |
| 19 |
@@ -17,13 +17,13 @@ ifeq ($(call config_opt,CONFIG_X86EMU),t |
| 20 |
CFLAGS += -Ilibs/x86emu |
| 21 |
LDFLAGS += -Llibs/x86emu |
| 22 |
LDLIBS += -lx86emu |
| 23 |
- V86OBJS = v86_x86emu.o v86_mem.o |
| 24 |
+ V86OBJS = v86_x86emu.o v86_mem.o v86_common.o |
| 25 |
V86LIB = x86emu |
| 26 |
else |
| 27 |
CFLAGS += -Ilibs/lrmi-0.10 |
| 28 |
LDFLAGS += -Llibs/lrmi-0.10 -static |
| 29 |
LDLIBS += -llrmi |
| 30 |
- V86OBJS = v86_lrmi.o |
| 31 |
+ V86OBJS = v86_lrmi.o v86_common.o |
| 32 |
V86LIB = lrmi |
| 33 |
endif |
| 34 |
|
| 35 |
@@ -40,17 +40,17 @@ all: $(V86LIB) v86d $(DEBUG_BUILD) |
| 36 |
%.o: %.c v86.h |
| 37 |
$(CC) $(CFLAGS) -c -o $@ $< |
| 38 |
|
| 39 |
-v86d: v86.o v86_common.o $(V86OBJS) |
| 40 |
- $(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@ |
| 41 |
+v86d: $(V86OBJS) $(V86LIB) v86.o |
| 42 |
+ $(CC) $(LDFLAGS) $(V86OBJS) v86.o $(LDLIBS) -o $@ |
| 43 |
|
| 44 |
-testvbe: testvbe.o v86_common.o $(V86OBJS) |
| 45 |
- $(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@ |
| 46 |
+testvbe: $(V86OBJS) $(V86LIB) testvbe.o |
| 47 |
+ $(CC) $(LDFLAGS) $(V86OBJS) testvbe.o $(LDLIBS) -o $@ |
| 48 |
|
| 49 |
x86emu: |
| 50 |
- make -w -C libs/x86emu |
| 51 |
+ $(MAKE) -w -C libs/x86emu |
| 52 |
|
| 53 |
lrmi: |
| 54 |
- make -e -w -C libs/lrmi-0.10 liblrmi.a |
| 55 |
+ $(MAKE) -e -w -C libs/lrmi-0.10 liblrmi.a |
| 56 |
|
| 57 |
clean: |
| 58 |
rm -rf *.o v86d testvbe |
Archives