diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2019-03-29 15:12:06 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2019-03-29 15:12:06 +0000 |
| commit | 7a3cc5e130aa3f77744e7fea746eab0c5541eb6e (patch) | |
| tree | 00abe509c4fced8404a0c3851b1db20fbca7bf0e | |
| parent | New libx264 releases now seem to detect and use Altivec during (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=497150
| -rw-r--r-- | games/stonesoup/files/patch-Makefile | 19 | ||||
| -rw-r--r-- | games/stonesoup/files/patch-rltiles_Makefile | 14 |
2 files changed, 28 insertions, 5 deletions
diff --git a/games/stonesoup/files/patch-Makefile b/games/stonesoup/files/patch-Makefile index ccfbc1708fd7..3aefcf6ca2b4 100644 --- a/games/stonesoup/files/patch-Makefile +++ b/games/stonesoup/files/patch-Makefile @@ -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,7 +18,18 @@ 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 @@ -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 diff --git a/games/stonesoup/files/patch-rltiles_Makefile b/games/stonesoup/files/patch-rltiles_Makefile index 51542cdafe9b..eab6f997abce 100644 --- a/games/stonesoup/files/patch-rltiles_Makefile +++ b/games/stonesoup/files/patch-rltiles_Makefile @@ -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 |