[gentoo-commits] gentoo-x86 commit in games-roguelike/stone-soup/files: stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch stone-soup-0.15.2-respect-flags-and-compiler.patch

[Julian Ospald (hasufell)]

hasufell    14/10/27 19:59:02

  Added:               
                        stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch
                        stone-soup-0.15.2-respect-flags-and-compiler.patch
  Log:
  version bump, possibly fix bug #527034
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

Revision  Changes    Path
1.1                  games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch?rev=1.1&content-type=text/plain

Index: stone-soup-0.15.2-Use-pkg-config-for-linking-to-ncurses.patch
===================================================================
From 88579f929f0fc777762de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@g.o>
Date: Mon, 27 Oct 2014 20:48:03 +0100
Subject: [PATCH 2/2] Use pkg-config for linking to ncurses

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034
---
 source/Makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/Makefile b/source/Makefile
index df51e70..2db2781 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -956,17 +956,15 @@ endif
 # Your ncurses library may include Unicode support, and you may not have a
 # separate libncursesw; this is the case on Mac OS/Darwin.
 ifdef LIBNCURSES_IS_UNICODE
-NC_LIB = ncurses
-NC_INCLUDE = $(NC_PREFIX)/include/ncurses
+NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses")
+NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncurses")
 else
-NC_LIB = ncursesw
-NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
+NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
+NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncursesw")
 endif
 
-INCLUDES_L += -isystem $(NC_INCLUDE)
-
 ifndef TILES
-LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
+LIBS += $(NC_LIBS)
 endif
 
 endif
@@ -1111,7 +1109,7 @@ CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS)
 else
 CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
 endif
-CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L)
+CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) $(NC_CFLAGS)
 ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L)
 YACC_CFLAGS  := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0
 
-- 
2.1.2




1.1                  games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.15.2-respect-flags-and-compiler.patch?rev=1.1&content-type=text/plain

Index: stone-soup-0.15.2-respect-flags-and-compiler.patch
===================================================================
From 14abbe4e6c888148caecbf16231ae48499d6d2b2 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@g.o>
Date: Mon, 27 Oct 2014 20:39:50 +0100
Subject: [PATCH 1/2] respect flags and compiler

---
 source/Makefile         |  5 ++---
 source/rltiles/Makefile | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/source/Makefile b/source/Makefile
index db39bd9..df51e70 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -101,7 +101,7 @@ include Makefile.obj
 #
 
 
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(EXTERNAL_FLAGS)
 CFWARN := -Wall -Wformat-security
 CFWARN_L := -Wundef
 
@@ -770,7 +770,6 @@ ifdef FULLDEBUG
 DEFINES += -DFULLDEBUG
 endif
 ifdef DEBUG
-CFOTHERS := -ggdb $(CFOTHERS)
 DEFINES += -DDEBUG
 endif
 ifndef NOWIZARD
@@ -1559,7 +1558,7 @@ ifdef ANDROID
         # prove that tiles were generated properly
 	grep tile_info rltiles/*.cc| head
 else
-	+$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
+	+$(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES)
 endif
 
 $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
diff --git a/source/rltiles/Makefile b/source/rltiles/Makefile
index aacd551..41b3ebe 100644
--- a/source/rltiles/Makefile
+++ b/source/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 @@ endif
 # 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 ANDROID
   CXXFLAGS :=
@@ -35,24 +35,24 @@ ifdef TILES
     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
 endif
 ifeq ($(uname_S),Linux)
-LDFLAGS += -ldl -lpthread
+LIBS += -ldl -lpthread
 endif
 
 # Attempt to use a full compiler name, to make
@@ -137,10 +137,10 @@ clean:
 
 distclean: clean
 
-%.o: %.cc .cflags
-	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+%.o: %.cc
+	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@
 
 $(TILEGEN): $(OBJECTS)
-	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
+	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
 
 .PHONY: all clean distclean
-- 
2.1.2