diff options
Diffstat (limited to 'games/stonesoup/files')
| -rw-r--r-- | games/stonesoup/files/patch-Makefile | 26 | ||||
| -rw-r--r-- | games/stonesoup/files/patch-util_gen__ver.pl | 10 |
2 files changed, 10 insertions, 26 deletions
diff --git a/games/stonesoup/files/patch-Makefile b/games/stonesoup/files/patch-Makefile index a46e350c3247..dda89d5bdfa8 100644 --- a/games/stonesoup/files/patch-Makefile +++ b/games/stonesoup/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-01-25 18:04:53 UTC +--- Makefile.orig 2025-05-02 16:11:38 UTC +++ Makefile -@@ -131,7 +131,7 @@ include Makefile.obj +@@ -131,7 +131,7 @@ STDFLAG = -std=c++11 # Which C++ standard to support STDFLAG = -std=c++11 @@ -9,7 +9,7 @@ # Build with FORCE_SSE=y to get better seed stability on 32 bit x86 builds. It # is not recommended to do this unless you are building with contrib lua. # On any 64bit builds where the arch supports it, (at least) sse2 is implied. -@@ -156,10 +156,6 @@ CFWARN_L += -Wextra \ +@@ -156,10 +156,6 @@ DEFINES := $(EXTERNAL_DEFINES) DEFINES := $(EXTERNAL_DEFINES) @@ -20,7 +20,7 @@ # # The GCC and GXX variables are set later. # -@@ -505,7 +501,7 @@ endif +@@ -511,7 +507,7 @@ endif # Attempt to use a full compiler name, to make # distcc builds work nicely. @@ -29,23 +29,7 @@ ifeq ($(LMACH),-) LMACH := endif -@@ -551,15 +547,6 @@ ifdef USE_ICC - - # Some very good optimization flags. - CFOPTIMIZE := -O2 -parallel --else -- -- ifneq (,$(shell $(GXX) --version|grep 'g++.*4\.2\.')) -- # OS X uses a buggy ancient version of gcc without fixes from even -- # subsequent point releases of 4.2. -- CFOPTIMIZE := -O0 -- else -- CFOPTIMIZE := -O2 -- endif - endif - - # Define this to automatically generate code optimized for your machine -@@ -860,7 +847,7 @@ ifndef NOWIZARD +@@ -882,7 +878,7 @@ ifdef NO_OPTIMIZE DEFINES += -DWIZARD endif ifdef NO_OPTIMIZE diff --git a/games/stonesoup/files/patch-util_gen__ver.pl b/games/stonesoup/files/patch-util_gen__ver.pl index 7323aee937d6..58ff3171816b 100644 --- a/games/stonesoup/files/patch-util_gen__ver.pl +++ b/games/stonesoup/files/patch-util_gen__ver.pl @@ -1,12 +1,12 @@ ---- util/gen_ver.pl.orig 2022-01-25 18:04:53 UTC +--- util/gen_ver.pl.orig 2025-05-02 16:11:38 UTC +++ util/gen_ver.pl -@@ -20,8 +20,7 @@ mkdir dirname($outfile); +@@ -21,8 +21,7 @@ mkdir dirname($outfile); # # Source tarbells distributed as part of a release include this file already # generated with the release version. --$_ = `git describe $mergebase 2> /dev/null` +-$_ = `git describe $mergebase 2> $nullfile` - || (open(IN, "<", "$scriptpath/release_ver") ? <IN> +$_ = (open(IN, "<", "$scriptpath/release_ver") ? <IN> - : die "Can't get version information: `git describe` failed (no git, no repository, or shallow clone), and $scriptpath/release_ver doesn't exist.\n") - or die "couldn't get the version information\n"; + : die "Error: Can't get version information: `git describe` failed (no git, no repository, or shallow clone), and $scriptpath/release_ver doesn't exist.\n") + or die "Error: couldn't get the version information\n"; |