| 1 |
hasufell 14/04/29 20:44:41 |
| 2 |
|
| 3 |
Added: stone-soup-0.14.1-build.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.14.1-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: stone-soup-0.14.1-build.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Fri Oct 5 13:55:07 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
respect flags and compiler |
| 22 |
|
| 23 |
--- a/source/Makefile |
| 24 |
+++ b/source/Makefile |
| 25 |
@@ -101,7 +101,7 @@ include Makefile.obj |
| 26 |
# |
| 27 |
|
| 28 |
|
| 29 |
-CFOTHERS := -pipe $(EXTERNAL_FLAGS) |
| 30 |
+CFOTHERS := $(EXTERNAL_FLAGS) |
| 31 |
CFWARN := -Wall -Wformat-security |
| 32 |
CFWARN_L := -Wundef |
| 33 |
|
| 34 |
@@ -747,7 +747,6 @@ ifdef FULLDEBUG |
| 35 |
DEFINES += -DFULLDEBUG |
| 36 |
endif |
| 37 |
ifdef DEBUG |
| 38 |
-CFOTHERS := -ggdb $(CFOTHERS) |
| 39 |
DEFINES += -DDEBUG |
| 40 |
endif |
| 41 |
ifndef NOWIZARD |
| 42 |
@@ -1513,7 +1512,7 @@ ifdef ANDROID |
| 43 |
# prove that tiles were generated properly |
| 44 |
grep tile_info rltiles/*.cc| head |
| 45 |
else |
| 46 |
- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES) |
| 47 |
+ +$(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES) |
| 48 |
endif |
| 49 |
|
| 50 |
$(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles |
| 51 |
--- a/source/rltiles/Makefile |
| 52 |
+++ b/source/rltiles/Makefile |
| 53 |
@@ -1,7 +1,7 @@ |
| 54 |
uname_S := $(shell uname -s) |
| 55 |
|
| 56 |
ifneq (,$(findstring MINGW,$(uname_S))) |
| 57 |
-LDFLAGS += -lmingw32 |
| 58 |
+LIBS += -lmingw32 |
| 59 |
endif |
| 60 |
|
| 61 |
# Note: since generation of tiles is done on the host, we don't care about |
| 62 |
@@ -10,7 +10,7 @@ endif |
| 63 |
# Also, cross-compilation with no system libraries for host rather than target |
| 64 |
# is not supported. If host=target, contribs are enough. |
| 65 |
|
| 66 |
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter |
| 67 |
+CXXFLAGS := -Wall -Wextra -Wno-parentheses -Wno-unused-parameter |
| 68 |
|
| 69 |
ifdef ANDROID |
| 70 |
CXXFLAGS := |
| 71 |
@@ -35,24 +35,24 @@ ifdef TILES |
| 72 |
PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a |
| 73 |
endif |
| 74 |
|
| 75 |
- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) |
| 76 |
- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) |
| 77 |
+ CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) |
| 78 |
+ LIBS += $(SDL_LDFLAGS) $(PNG_LIB) |
| 79 |
|
| 80 |
- CFLAGS += -DUSE_TILE |
| 81 |
+ CXXFLAGS += -DUSE_TILE |
| 82 |
endif |
| 83 |
|
| 84 |
ifdef DEBUG |
| 85 |
-CFLAGS += -O0 -DDEBUG -ggdb |
| 86 |
+CXXFLAGS += -DDEBUG |
| 87 |
endif |
| 88 |
|
| 89 |
ifneq (,$(findstring MINGW,$(uname_S))) |
| 90 |
-LDFLAGS += -lgdi32 -lwinmm |
| 91 |
+LIBS += -lgdi32 -lwinmm |
| 92 |
endif |
| 93 |
ifeq ($(uname_S),Darwin) |
| 94 |
LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL |
| 95 |
endif |
| 96 |
ifeq ($(uname_S),Linux) |
| 97 |
-LDFLAGS += -ldl -lpthread |
| 98 |
+LIBS += -ldl -lpthread |
| 99 |
endif |
| 100 |
|
| 101 |
# Attempt to use a full compiler name, to make |
| 102 |
@@ -137,10 +137,10 @@ clean: |
| 103 |
|
| 104 |
distclean: clean |
| 105 |
|
| 106 |
-%.o: %.cc .cflags |
| 107 |
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ |
| 108 |
+%.o: %.cc |
| 109 |
+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@ |
| 110 |
|
| 111 |
$(TILEGEN): $(OBJECTS) |
| 112 |
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) |
| 113 |
+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) |
| 114 |
|
| 115 |
.PHONY: all clean distclean |
Archives