| 1 |
vapier 13/04/30 03:24:33 |
| 2 |
|
| 3 |
Added: softgun-0.22-make.patch |
| 4 |
Log: |
| 5 |
Version bump #467870 by Agostino Sarubbo. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/softgun/files/softgun-0.22-make.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/softgun/files/softgun-0.22-make.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/softgun/files/softgun-0.22-make.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: softgun-0.22-make.patch |
| 16 |
=================================================================== |
| 17 |
--- softgun-0.22/config.mk |
| 18 |
+++ softgun-0.22/config.mk |
| 19 |
@@ -9,7 +9,7 @@ bindir=$(prefix)/bin |
| 20 |
libdir=$(prefix)/lib/softgun/ |
| 21 |
|
| 22 |
#CFLAGS=-Wall -pg -O0 -DPROFILE |
| 23 |
-CFLAGS=-Wall -O9 -g -fomit-frame-pointer -fno-strict-overflow -Wstrict-overflow=3 -Wno-unused-but-set-variable |
| 24 |
-DEFS=-D_GNU_SOURCE |
| 25 |
+CFLAGS+=-Wall -fno-strict-overflow -Wstrict-overflow=3 -Wno-unused-but-set-variable -fno-strict-aliasing |
| 26 |
+DEFS=$(CPPFLAGS) -D_GNU_SOURCE |
| 27 |
INCLUDES:=-I$(top_srcdir) -I. |
| 28 |
|
| 29 |
@@ -17,15 +17,16 @@ INCLUDES:=-I$(top_srcdir) -I. |
| 30 |
# to omit stack protection symbol in object file |
| 31 |
SHAREDCFLAGS=-fPIC -nostdlib -D_SHARED_ |
| 32 |
SHAREDLDFLAGS=-nostdlib -shared |
| 33 |
-CYGWIN=$(findstring CYGWIN,$(shell uname)) |
| 34 |
-ifeq ($(shell uname),Linux) |
| 35 |
-LDFLAGS=-lpthread -lrt -lm -lz -lasound |
| 36 |
+UNAME=$(shell uname) |
| 37 |
+CYGWIN=$(findstring CYGWIN,$(UNAME)) |
| 38 |
+ifeq ($(UNAME),Linux) |
| 39 |
+LDLIBS=-lpthread -ldl -lrt -lm -lz -lasound |
| 40 |
else |
| 41 |
- ifeq ($(shell uname),FreeBSD) |
| 42 |
- LDFLAGS=-lpthread -lm -lz -lSDL |
| 43 |
+ ifeq ($(UNAME),FreeBSD) |
| 44 |
+ LDLIBS=-lpthread -lm -lz -lSDL |
| 45 |
else |
| 46 |
ifeq ($(CYGWIN),CYGWIN) |
| 47 |
- LDFLAGS=-lpthread -lrt -lm -lz |
| 48 |
+ LDLIBS=-lpthread -lrt -lm -lz |
| 49 |
else |
| 50 |
$(error "Unknown architecture $(shell uname)") |
| 51 |
endif |
| 52 |
--- softgun-0.22/Makefile |
| 53 |
+++ softgun-0.22/Makefile |
| 54 |
@@ -116,7 +116,7 @@ |
| 55 |
|
| 56 |
|
| 57 |
softgun: $(OBJS) |
| 58 |
- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) |
| 59 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS) |
| 60 |
|
| 61 |
boards/libboards.a: |
| 62 |
$(MAKE) -C boards libboards.a |
| 63 |
--- softgun-0.22/printer/module.mk |
| 64 |
+++ softgun-0.22/printer/module.mk |
| 65 |
@@ -5,5 +5,5 @@ |
| 66 |
INSTALL_BINS += pcl3gui2png |
| 67 |
|
| 68 |
pcl3gui2png: $(PRINTER_OBJS) printer/pcl3gui2png.c |
| 69 |
- $(CC) -o $@ $(PRINTER_OBJS) printer/pcl3gui2png.c |
| 70 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ |
| 71 |
|
| 72 |
--- softgun-0.22/tools/Makefile |
| 73 |
+++ softgun-0.22/tools/Makefile |
| 74 |
@@ -2,7 +2,7 @@ include ../config.mk |
| 75 |
|
| 76 |
ifeq ($(shell uname),Linux) |
| 77 |
sg_tunctl: tunctl.c |
| 78 |
- $(CC) $(CFLAGS) tunctl.c -o sg_tunctl |
| 79 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ |
| 80 |
|
| 81 |
install: |
| 82 |
install -m 0755 sg_tunctl $(bindir) |
| 83 |
@@ -14,7 +14,7 @@ install: |
| 84 |
endif |
| 85 |
|
| 86 |
to_c_array: to_c_array.c |
| 87 |
- $(CC) $(CFLAGS) to_c_array.c -o to_c_array |
| 88 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ |
| 89 |
|
| 90 |
|
| 91 |
clean: |
Archives