ccollect:0.6.2->0.7.0
[nslu2-linux/optware.git] / sources / qemu / makefile.patch
blobb7fbf7bbe4a9c5086e0e17275813f8198d93c513
1 --- qemu-0.7.0/Makefile~ 2005-04-27 13:52:05.000000000 -0700
2 +++ qemu-0.7.0/Makefile 2005-07-21 21:55:00.000000000 -0700
3 @@ -1,12 +1,12 @@
4 -include config-host.mak
6 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing
7 +CFLAGS+=-fno-strict-aliasing
8 ifdef CONFIG_DARWIN
9 CFLAGS+= -mdynamic-no-pic
10 endif
11 -LDFLAGS=-g
12 -LIBS=
13 -DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
14 +#LDFLAGS=-g
15 +#LIBS=
16 +DEFINES+=-D_GNU_SOURCE #-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
17 TOOLS=qemu-img$(EXESUF)
18 ifdef CONFIG_STATIC
19 LDFLAGS+=-static
20 --- qemu-0.7.0/Makefile.target~ 2005-04-27 13:52:05.000000000 -0700
21 +++ qemu-0.7.0/Makefile.target 2005-07-21 21:55:57.000000000 -0700
22 @@ -14,10 +14,10 @@
23 VPATH+=:$(SRC_PATH)/linux-user
24 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
25 endif
26 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing
27 +CFLAGS+=-fno-strict-aliasing
28 #CFLAGS+=-Werror
29 -LDFLAGS=-g
30 -LIBS=
31 +#LDFLAGS=-g
32 +#LIBS=
33 HELPER_CFLAGS=$(CFLAGS)
34 DYNGEN=../dyngen$(EXESUF)
35 # user emulator name
36 @@ -211,7 +211,7 @@
38 #########################################################
40 -DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
41 +DEFINES+=-D_GNU_SOURCE #-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
42 LIBS+=-lm
43 ifndef CONFIG_USER_ONLY
44 LIBS+=-lz
45 @@ -369,7 +369,7 @@
46 VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
47 endif
49 -VL_LDFLAGS=
50 +VL_LDFLAGS=$(LDFLAGS)
51 # specific flags are needed for non soft mmu emulator
52 ifdef CONFIG_STATIC
53 VL_LDFLAGS+=-static
54 @@ -463,7 +463,7 @@
56 install: all
57 ifneq ($(PROGS),)
58 - install -m 755 -s $(PROGS) "$(bindir)"
59 + install -m 755 $(PROGS) "$(bindir)"
60 endif
62 ifneq ($(wildcard .depend),)
63 --- qemu/Makefile~ 2005-07-24 15:43:12.000000000 -0700
64 +++ qemu/Makefile 2005-07-24 15:49:01.000000000 -0700
65 @@ -55,7 +55,7 @@
67 install: all
68 mkdir -p "$(bindir)"
69 - install -m 755 -s $(TOOLS) "$(bindir)"
70 + install -m 755 $(TOOLS) "$(bindir)"
71 mkdir -p "$(datadir)"
72 install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
73 pc-bios/vgabios-cirrus.bin \