diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-02-09 14:05:48 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-02-09 14:05:48 +0000 |
| commit | 41330346ffcaedce8aad5441429a3aee8621270b (patch) | |
| tree | 61b1e704b545a183074b5c3a35ff9406a07bbf79 /games-fps | |
| parent | Remove dead homepage. (diff) | |
| download | gentoo-2-41330346ffcaedce8aad5441429a3aee8621270b.tar.gz gentoo-2-41330346ffcaedce8aad5441429a3aee8621270b.tar.bz2 gentoo-2-41330346ffcaedce8aad5441429a3aee8621270b.zip | |
fix build on clang
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/eduke32/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/eduke32/files/eduke32-20130201.3453-QA.patch | 18 |
2 files changed, 18 insertions, 6 deletions
diff --git a/games-fps/eduke32/ChangeLog b/games-fps/eduke32/ChangeLog index 50b6cec38854..4f79f96a6c9b 100644 --- a/games-fps/eduke32/ChangeLog +++ b/games-fps/eduke32/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/eduke32 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.1 2013/02/02 18:36:55 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/eduke32/ChangeLog,v 1.2 2013/02/09 14:05:48 hasufell Exp $ + + 09 Feb 2013; Julian Ospald <hasufell@gentoo.org> + files/eduke32-20130201.3453-QA.patch: + fix build on clang *eduke32-20130201.3453 (02 Feb 2013) diff --git a/games-fps/eduke32/files/eduke32-20130201.3453-QA.patch b/games-fps/eduke32/files/eduke32-20130201.3453-QA.patch index 8fb1d5a77eb0..534c507e0a4a 100644 --- a/games-fps/eduke32/files/eduke32-20130201.3453-QA.patch +++ b/games-fps/eduke32/files/eduke32-20130201.3453-QA.patch @@ -59,16 +59,15 @@ Subject: build system PROFILER?=0 MUDFLAP?=0 -@@ -268,11 +267,10 @@ - +@@ -269,10 +268,9 @@ # compiler flags etc. --BASECFLAGS= -+BASECFLAGS = $(CFLAGS) -std=gnu89 - BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement + BASECFLAGS= +-BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement -BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing -BASEASFLAGS=-s #-g -BASELDFLAGS= ++BASECONLYFLAGS = $(CFLAGS) -std=gnu89 -Wimplicit -Wdeclaration-after-statement +BASECXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing +BASELDFLAGS = $(LDFLAGS) @@ -143,3 +142,12 @@ Subject: build system .PHONY: clean cleanutils veryclean all utils dxutils sdlutils printutils printsdlutils printdxutils enginelib editorlib # TARGETS +@@ -265,7 +267,7 @@ + if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS) -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi + arttool$(EXESUFFIX): $(OBJ)/arttool.$o $(UTILADDOBJS) + $(ONESTEP_STATUS) +- if $(L_CXX) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi ++ if $(L_CXX) $(OURCXXFLAGS) -o $@ $^ $(OURLDFLAGS) $(STATICSTDCPP) $(STDCPPLIB) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi + givedepth$(EXESUFFIX): $(OBJ)/givedepth.$o $(UTILADDOBJS) + $(ONESTEP_STATUS) + if $(LINKER) -o $@ $^ $(OURLDFLAGS) $(UTILLIBS); then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi |