The following commit has been merged in the master branch: commit 3cf4b03ef2381589f8026bb2bd1eb18ae79d644e Author: Ansgar Burchardt <[EMAIL PROTECTED]> Date: Tue Jul 1 17:28:47 2008 +0200
Use compiler flags passed by dpkg-buildpackage This also make compilation on powerpc work again: -minline-all-stringops is only supported on i386 and x86-64. diff --git a/debian/changelog b/debian/changelog index fe812fd..272a2c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,11 +16,12 @@ simutrans (100.0-1) unstable; urgency=low * Bump Standards Version to 3.8.0 + Add debian/README.source * Convert debian/copyright to proposed machine-readable format + * Use compiler flags passed by dpkg-buildpackage [ Gonéri Le Bouder ] * Update the copyright file - -- Ansgar Burchardt <[EMAIL PROTECTED]> Tue, 01 Jul 2008 16:54:58 +0200 + -- Ansgar Burchardt <[EMAIL PROTECTED]> Tue, 01 Jul 2008 17:27:13 +0200 simutrans (99.18~0.svn1664-2) unstable; urgency=low diff --git a/debian/patches/config.diff b/debian/patches/config.diff index 42df093..cec4339 100644 --- a/debian/patches/config.diff +++ b/debian/patches/config.diff @@ -2,10 +2,10 @@ Build configuration for Debian @DPATCH@ -Index: simutrans-debian/makeobj/Makefile +Index: simutrans/makeobj/Makefile =================================================================== ---- simutrans-debian.orig/makeobj/Makefile -+++ simutrans-debian/makeobj/Makefile +--- simutrans.orig/makeobj/Makefile ++++ simutrans/makeobj/Makefile @@ -2,8 +2,8 @@ #OSTYPE = beos #OSTYPE = cygwin @@ -25,8 +25,8 @@ Index: simutrans-debian/makeobj/Makefile -CFLAGS = -O -CXXFLAGS = -O +LDLIBS=-lpng -lm -+CFLAGS = -O -g -W -Wall -+CXXFLAGS = -O -g -W -Wall ++CFLAGS += -W -Wall ++CXXFLAGS += -W -Wall endif ifeq ($(OSTYPE),beos) @@ -39,10 +39,10 @@ Index: simutrans-debian/makeobj/Makefile clean: rm -f $(OBJECTS) -Index: simutrans-debian/config.default +Index: simutrans/config.default =================================================================== --- /dev/null -+++ simutrans-debian/config.default ++++ simutrans/config.default @@ -0,0 +1,65 @@ +# +# to compile: @@ -109,3 +109,53 @@ Index: simutrans-debian/config.default + FLAGS += -DBIG_ENDIAN +endif + +Index: simutrans/Makefile +=================================================================== +--- simutrans.orig/Makefile ++++ simutrans/Makefile +@@ -57,27 +57,27 @@ + SDL_CONFIG ?= sdl-config + + +-ifneq ($(OPTIMISE),) +- ifneq ($(PROFILE),) +- CFLAGS += -O3 -minline-all-stringops +- CXXFLAGS += -O3 +- else +- CFLAGS += -O3 -fomit-frame-pointer +- CXXFLAGS += -O3 -fomit-frame-pointer +- endif +- ifneq ($(OSTYPE),mac) +- CFLAGS += -minline-all-stringops +- LDFLAGS += -ffunctions-sections +- endif +-else +- CFLAGS += -O +- CXXFLAGS += -O +-endif ++#ifneq ($(OPTIMISE),) ++# ifneq ($(PROFILE),) ++# CFLAGS += -O3 -minline-all-stringops ++# CXXFLAGS += -O3 ++# else ++# CFLAGS += -O3 -fomit-frame-pointer ++# CXXFLAGS += -O3 -fomit-frame-pointer ++# endif ++# ifneq ($(OSTYPE),mac) ++# CFLAGS += -minline-all-stringops ++# LDFLAGS += -ffunctions-sections ++# endif ++#else ++# CFLAGS += -O ++# CXXFLAGS += -O ++#endif + + ifdef DEBUG + ifeq ($(shell expr $(DEBUG) \>= 1), 1) +- CFLAGS += -g -DDEBUG +- CXXFLAGS += -g -DDEBUG ++ CFLAGS += -DDEBUG ++ CXXFLAGS += -DDEBUG + endif + ifeq ($(shell expr $(DEBUG) \>= 2), 1) + CFLAGS += -fno-inline -- transportation simulator _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits