Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Mar 2019 15:12:06 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r497150 - head/games/stonesoup/files
Message-ID:  <201903291512.x2TFC6N6074792@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Fri Mar 29 15:12:06 2019
New Revision: 497150
URL: https://svnweb.freebsd.org/changeset/ports/497150

Log:
  Fix build on gcc-based architectures by respecting LDFLAGS and CXXFLAGS:
  
    ld-elf.so.1: /usr/lib/libstdc++.so.6: version CXXABI_1.3.8 required by /wrkdirs/usr/ports/games/stonesoup/work/crawl-0.23.1/crawl-ref/source/rltiles/tool/tilegen.elf not found
  
  PR:		236691
  Submitted by:	Piotr Kubaj
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/games/stonesoup/files/patch-Makefile
  head/games/stonesoup/files/patch-rltiles_Makefile

Modified: head/games/stonesoup/files/patch-Makefile
==============================================================================
--- head/games/stonesoup/files/patch-Makefile	Fri Mar 29 14:58:45 2019	(r497149)
+++ head/games/stonesoup/files/patch-Makefile	Fri Mar 29 15:12:06 2019	(r497150)
@@ -1,4 +1,4 @@
---- Makefile.orig	2019-03-04 02:25:24 UTC
+--- Makefile.orig	2019-02-28 23:45:55 UTC
 +++ Makefile
 @@ -75,7 +75,7 @@
  #    them; you can also ask for a package with convenience libraries instead --
@@ -18,8 +18,19 @@
  ifndef NOSSE
  # force SSE2 dependency, so as to avoid both x87 indeterminacies, and 
  # to prevent lua from using non-standard rounding methods.
-@@ -513,15 +513,6 @@ ifdef USE_ICC
+@@ -125,10 +125,6 @@ CFWARN_L := -Wall -Wformat-security -Wundef
  
+ DEFINES := $(EXTERNAL_DEFINES)
+ 
+-ifndef ANDROID
+-LDFLAGS :=
+-endif
+-
+ #
+ # The GCC and GXX variables are set later.
+ #
+@@ -513,15 +509,6 @@ ifdef USE_ICC
+ 
  # Some very good optimization flags.
    CFOPTIMIZE := -O2 -parallel
 -else
@@ -34,7 +45,7 @@
  endif
  
  # Define this to automatically generate code optimized for your machine
-@@ -635,7 +626,7 @@ endif
+@@ -635,7 +622,7 @@ endif
  
  ifndef BUILD_SQLITE
    ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
@@ -43,7 +54,7 @@
      LIBS += $(SQLITE_LIB)
      ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes)
        DEFINES_L += -DANCIENT_SQLITE
-@@ -798,7 +789,7 @@ ifndef NOWIZARD
+@@ -798,7 +785,7 @@ ifndef NOWIZARD
  DEFINES += -DWIZARD
  endif
  ifdef NO_OPTIMIZE

Modified: head/games/stonesoup/files/patch-rltiles_Makefile
==============================================================================
--- head/games/stonesoup/files/patch-rltiles_Makefile	Fri Mar 29 14:58:45 2019	(r497149)
+++ head/games/stonesoup/files/patch-rltiles_Makefile	Fri Mar 29 15:12:06 2019	(r497150)
@@ -1,4 +1,4 @@
---- rltiles/Makefile.orig	2016-04-30 03:53:03 UTC
+--- rltiles/Makefile.orig	2019-02-28 23:45:55 UTC
 +++ rltiles/Makefile
 @@ -11,7 +11,6 @@ endif
  # is not supported.  If host=target, contribs are enough.
@@ -26,3 +26,15 @@
  
  DELETE = rm -f
  
+@@ -131,9 +130,9 @@ clean:
+ distclean: clean
+ 
+ %.o: %.cc .cflags
+-	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
++	$(QUIET_HOSTCXX)$(HOSTCXX) $(CXXFLAGS) -MMD -c $< -o $@
+ 
+ $(TILEGEN): $(OBJECTS)
+-	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
+ 
+ .PHONY: all clean distclean



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903291512.x2TFC6N6074792>