| 1 |
hasufell 12/08/28 23:17:53 |
| 2 |
|
| 3 |
Added: stone-soup-0.10.3-build.patch |
| 4 |
Log: |
| 5 |
initial import wrt #374852 reviewed by Michael Sterrett |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-roguelike/stone-soup/files/stone-soup-0.10.3-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.10.3-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.10.3-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: stone-soup-0.10.3-build.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Sat Aug 25 18:31:45 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
respect flags and compiler |
| 22 |
|
| 23 |
--- Makefile |
| 24 |
+++ Makefile |
| 25 |
@@ -111,7 +111,7 @@ |
| 26 |
|
| 27 |
else |
| 28 |
|
| 29 |
-CFOPTIMIZE := -O2 |
| 30 |
+CFOPTIMIZE = $(CXXFLAGS) |
| 31 |
|
| 32 |
endif # USE_ICC |
| 33 |
|
| 34 |
@@ -119,21 +119,19 @@ |
| 35 |
CFOPTIMIZE += -flto=jobserver -fwhole-program |
| 36 |
endif |
| 37 |
|
| 38 |
-CFOTHERS := -pipe $(EXTERNAL_FLAGS) |
| 39 |
+CFOTHERS := $(EXTERNAL_FLAGS) |
| 40 |
CFWARN := -Wall -Wformat-security |
| 41 |
CFWARN_L := -Wundef |
| 42 |
|
| 43 |
DEFINES := $(EXTERNAL_DEFINES) |
| 44 |
|
| 45 |
-LDFLAGS := $(EXTERNAL_LDFLAGS) |
| 46 |
- |
| 47 |
# |
| 48 |
# The GCC and GXX variables are set later. |
| 49 |
# |
| 50 |
-AR = ar |
| 51 |
-RANLIB = ranlib |
| 52 |
-CC = $(GCC) |
| 53 |
-CXX = $(GXX) |
| 54 |
+AR ?= ar |
| 55 |
+RANLIB ?= ranlib |
| 56 |
+CC ?= $(GCC) |
| 57 |
+CXX ?= $(GXX) |
| 58 |
RM = rm -f |
| 59 |
COPY = cp |
| 60 |
COPY_R = cp -r |
| 61 |
@@ -144,7 +142,7 @@ |
| 62 |
PNGCRUSH = $(COPY) |
| 63 |
PNGCRUSH_LABEL = COPY |
| 64 |
ADVPNG = advpng -z -4 |
| 65 |
-PKGCONFIG = pkg-config |
| 66 |
+PKGCONFIG ?= pkg-config |
| 67 |
DOXYGEN = doxygen |
| 68 |
DOXYGEN_SIMPLE_CONF = crawl_simple.doxy |
| 69 |
DOXYGEN_ALL_CONF = crawl_all.doxy |
| 70 |
@@ -1143,7 +1141,6 @@ |
| 71 |
endif |
| 72 |
[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix) |
| 73 |
$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/ |
| 74 |
- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME) |
| 75 |
mkdir -p $(datadir_fp)/dat/des |
| 76 |
mkdir -p $(datadir_fp)/dat/dlua |
| 77 |
mkdir -p $(datadir_fp)/dat/lua |
| 78 |
@@ -1339,7 +1336,7 @@ |
| 79 |
|
| 80 |
.PHONY: build-rltiles |
| 81 |
build-rltiles: .contrib-libs $(RLTILES)/dc-unrand.txt |
| 82 |
- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES) |
| 83 |
+ +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES) |
| 84 |
|
| 85 |
$(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles |
| 86 |
|
| 87 |
--- rltiles/Makefile |
| 88 |
+++ rltiles/Makefile |
| 89 |
@@ -1,7 +1,7 @@ |
| 90 |
uname_S := $(shell uname -s) |
| 91 |
|
| 92 |
ifneq (,$(findstring MINGW,$(uname_S))) |
| 93 |
-LDFLAGS += -lmingw32 |
| 94 |
+LIBS += -lmingw32 |
| 95 |
endif |
| 96 |
|
| 97 |
# Note: since generation of tiles is done on the host, we don't care about |
| 98 |
@@ -10,7 +10,7 @@ |
| 99 |
# Also, cross-compilation with no system libraries for host rather than target |
| 100 |
# is not supported. If host=target, contribs are enough. |
| 101 |
|
| 102 |
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter |
| 103 |
+CXXFLAGS += -Wall -Wextra -Wno-parentheses -Wno-unused-parameter |
| 104 |
|
| 105 |
ifdef TILES |
| 106 |
ifndef CONTRIB_SDL |
| 107 |
@@ -29,24 +29,24 @@ |
| 108 |
PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a |
| 109 |
endif |
| 110 |
|
| 111 |
- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) |
| 112 |
- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) |
| 113 |
+ CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) |
| 114 |
+ LIBS += $(SDL_LDFLAGS) $(PNG_LIB) |
| 115 |
|
| 116 |
- CFLAGS += -DUSE_TILE |
| 117 |
+ CXXFLAGS += -DUSE_TILE |
| 118 |
endif |
| 119 |
|
| 120 |
ifdef DEBUG |
| 121 |
-CFLAGS += -O0 -DDEBUG -ggdb |
| 122 |
+CXXFLAGS += -DDEBUG |
| 123 |
endif |
| 124 |
|
| 125 |
ifneq (,$(findstring MINGW,$(uname_S))) |
| 126 |
-LDFLAGS += -lgdi32 -lwinmm |
| 127 |
+LIBS += -lgdi32 -lwinmm |
| 128 |
endif |
| 129 |
ifeq ($(uname_S),Darwin) |
| 130 |
-LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL |
| 131 |
+LIBS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL |
| 132 |
endif |
| 133 |
ifeq ($(uname_S),Linux) |
| 134 |
-LDFLAGS += -ldl -lpthread |
| 135 |
+LIBS += -ldl -lpthread |
| 136 |
endif |
| 137 |
|
| 138 |
# Attempt to use a full compiler name, to make |
| 139 |
@@ -129,9 +129,9 @@ |
| 140 |
distclean: clean |
| 141 |
|
| 142 |
%.o: %.cc .cflags |
| 143 |
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@ |
| 144 |
+ $(CXX) $(CXXFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@ |
| 145 |
|
| 146 |
$(TILEGEN): $(OBJECTS) |
| 147 |
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) |
| 148 |
+ $(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) |
| 149 |
|
| 150 |
.PHONY: all clean distclean |
Archives