From owner-svn-ports-all@freebsd.org Fri Mar 29 15:12:07 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29A95156C0CA; Fri, 29 Mar 2019 15:12:07 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C05EF6826B; Fri, 29 Mar 2019 15:12:06 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A89A8EF; Fri, 29 Mar 2019 15:12:06 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2TFC6i2074793; Fri, 29 Mar 2019 15:12:06 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2TFC6N6074792; Fri, 29 Mar 2019 15:12:06 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201903291512.x2TFC6N6074792@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 29 Mar 2019 15:12:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497150 - head/games/stonesoup/files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/games/stonesoup/files X-SVN-Commit-Revision: 497150 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C05EF6826B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2019 15:12:07 -0000 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