Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 322420 Details for
Bug 374852
ebuild request: games-roguelike/stone-soup
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
stone-soup-0.10.3-build.patch
stone-soup-0.10.3-build.patch (text/plain), 3.33 KB, created by
Julian Ospald
on 2012-08-28 09:33:41 UTC
(
hide
)
Description:
stone-soup-0.10.3-build.patch
Filename:
MIME Type:
Creator:
Julian Ospald
Created:
2012-08-28 09:33:41 UTC
Size:
3.33 KB
patch
obsolete
>From: Julian Ospald <hasufell@gentoo.org> >Date: Sat Aug 25 18:31:45 UTC 2012 >Subject: build system > >respect flags and compiler > >--- Makefile >+++ Makefile >@@ -111,7 +111,7 @@ > > else > >-CFOPTIMIZE := -O2 >+CFOPTIMIZE = $(CXXFLAGS) > > endif # USE_ICC > >@@ -119,21 +119,19 @@ > CFOPTIMIZE += -flto=jobserver -fwhole-program > endif > >-CFOTHERS := -pipe $(EXTERNAL_FLAGS) >+CFOTHERS := $(EXTERNAL_FLAGS) > CFWARN := -Wall -Wformat-security > CFWARN_L := -Wundef > > DEFINES := $(EXTERNAL_DEFINES) > >-LDFLAGS := $(EXTERNAL_LDFLAGS) >- > # > # The GCC and GXX variables are set later. > # >-AR = ar >-RANLIB = ranlib >-CC = $(GCC) >-CXX = $(GXX) >+AR ?= ar >+RANLIB ?= ranlib >+CC ?= $(GCC) >+CXX ?= $(GXX) > RM = rm -f > COPY = cp > COPY_R = cp -r >@@ -144,7 +142,7 @@ > PNGCRUSH = $(COPY) > PNGCRUSH_LABEL = COPY > ADVPNG = advpng -z -4 >-PKGCONFIG = pkg-config >+PKGCONFIG ?= pkg-config > DOXYGEN = doxygen > DOXYGEN_SIMPLE_CONF = crawl_simple.doxy > DOXYGEN_ALL_CONF = crawl_all.doxy >@@ -1143,7 +1141,6 @@ > endif > [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix) > $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/ >- $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME) > mkdir -p $(datadir_fp)/dat/des > mkdir -p $(datadir_fp)/dat/dlua > mkdir -p $(datadir_fp)/dat/lua >@@ -1339,7 +1336,7 @@ > > .PHONY: build-rltiles > build-rltiles: .contrib-libs $(RLTILES)/dc-unrand.txt >- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES) >+ +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES) > > $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles > >--- rltiles/Makefile >+++ rltiles/Makefile >@@ -1,7 +1,7 @@ > uname_S := $(shell uname -s) > > ifneq (,$(findstring MINGW,$(uname_S))) >-LDFLAGS += -lmingw32 >+LIBS += -lmingw32 > endif > > # Note: since generation of tiles is done on the host, we don't care about >@@ -10,7 +10,7 @@ > # Also, cross-compilation with no system libraries for host rather than target > # is not supported. If host=target, contribs are enough. > >-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter >+CXXFLAGS += -Wall -Wextra -Wno-parentheses -Wno-unused-parameter > > ifdef TILES > ifndef CONTRIB_SDL >@@ -29,24 +29,24 @@ > PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a > endif > >- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) >- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) >+ CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) >+ LIBS += $(SDL_LDFLAGS) $(PNG_LIB) > >- CFLAGS += -DUSE_TILE >+ CXXFLAGS += -DUSE_TILE > endif > > ifdef DEBUG >-CFLAGS += -O0 -DDEBUG -ggdb >+CXXFLAGS += -DDEBUG > endif > > ifneq (,$(findstring MINGW,$(uname_S))) >-LDFLAGS += -lgdi32 -lwinmm >+LIBS += -lgdi32 -lwinmm > endif > ifeq ($(uname_S),Darwin) >-LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL >+LIBS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL > endif > ifeq ($(uname_S),Linux) >-LDFLAGS += -ldl -lpthread >+LIBS += -ldl -lpthread > endif > > # Attempt to use a full compiler name, to make >@@ -129,9 +129,9 @@ > distclean: clean > > %.o: %.cc .cflags >- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@ >+ $(CXX) $(CXXFLAGS) -Wp,-MD,$*.d,-MT,$@ -c $< -o $@ > > $(TILEGEN): $(OBJECTS) >- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) >+ $(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) > > .PHONY: all clean distclean
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 374852
:
282207
|
283021
|
283277
|
306633
|
322418
| 322420