remove endless-sky-0.9.4-std-gnu++11.patch; use gnu++11 only on ppc64le
This commit is contained in:
parent
ed4ea6d21e
commit
3dd65bc466
|
@ -1,11 +1,10 @@
|
||||||
diff -up ./SConstruct.orig ./SConstruct
|
--- SConstruct.orig 2017-09-13 20:00:51.154361127 -0700
|
||||||
--- ./SConstruct.orig 2017-01-01 22:16:40.914893288 -0800
|
+++ SConstruct 2017-09-13 20:24:45.396884800 -0700
|
||||||
+++ ./SConstruct 2017-01-01 22:22:26.934720111 -0800
|
@@ -25,14 +25,7 @@
|
||||||
@@ -22,14 +22,7 @@ opts.Update(env)
|
|
||||||
|
|
||||||
Help(opts.GenerateHelpText(env))
|
Help(opts.GenerateHelpText(env))
|
||||||
|
|
||||||
-flags = ["-std=gnu++11", "-Wall"]
|
-flags = ["-std=c++11", "-Wall"]
|
||||||
-if env["mode"] != "debug":
|
-if env["mode"] != "debug":
|
||||||
- flags += ["-O3"]
|
- flags += ["-O3"]
|
||||||
-if env["mode"] == "debug":
|
-if env["mode"] == "debug":
|
||||||
|
@ -13,7 +12,7 @@ diff -up ./SConstruct.orig ./SConstruct
|
||||||
-if env["mode"] == "profile":
|
-if env["mode"] == "profile":
|
||||||
- flags += ["-pg"]
|
- flags += ["-pg"]
|
||||||
- env.Append(LINKFLAGS = ["-pg"])
|
- env.Append(LINKFLAGS = ["-pg"])
|
||||||
+flags = ["-std=gnu++11"]
|
+flags = ["-std=c++11"]
|
||||||
|
|
||||||
# Required build flags. If you want to use SSE optimization, you can turn on
|
# Required build flags. If you want to use SSE optimization, you can turn on
|
||||||
# -msse3 or (if just building for your own computer) -march=native.
|
# -msse3 or (if just building for your own computer) -march=native.
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- SConstruct.orig2 2016-10-04 05:44:52.000000000 -0700
|
|
||||||
+++ SConstruct 2016-10-31 23:09:20.880648829 -0700
|
|
||||||
@@ -22,7 +22,7 @@
|
|
||||||
|
|
||||||
Help(opts.GenerateHelpText(env))
|
|
||||||
|
|
||||||
-flags = ["-std=c++11", "-Wall"]
|
|
||||||
+flags = ["-std=gnu++11", "-Wall"]
|
|
||||||
if env["mode"] != "debug":
|
|
||||||
flags += ["-O3"]
|
|
||||||
if env["mode"] == "debug":
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: endless-sky
|
Name: endless-sky
|
||||||
Version: 0.9.8
|
Version: 0.9.8
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Space exploration, trading, and combat game
|
Summary: Space exploration, trading, and combat game
|
||||||
|
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
|
@ -13,11 +13,8 @@ Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%
|
||||||
# Patch not submitted upstream. Upstream conforms to Debian packaging
|
# Patch not submitted upstream. Upstream conforms to Debian packaging
|
||||||
# standards where the use of /usr/games is acceptable.
|
# standards where the use of /usr/games is acceptable.
|
||||||
Patch0: endless-sky-0.8.10-remove-games-path.patch
|
Patch0: endless-sky-0.8.10-remove-games-path.patch
|
||||||
# Use gnu++11 standard instead of c++11. Fixes a FTBFS issue on ppc64le.
|
|
||||||
# https://github.com/endless-sky/endless-sky/pull/1804
|
|
||||||
Patch1: endless-sky-0.9.4-std-gnu++11.patch
|
|
||||||
# Unset CCFLAGS override inside SConstruct.
|
# Unset CCFLAGS override inside SConstruct.
|
||||||
Patch2: endless-sky-0.9.4-remove-additional-ccflags.patch
|
Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch
|
||||||
|
|
||||||
Requires: %{name}-data = %{version}-%{release}
|
Requires: %{name}-data = %{version}-%{release}
|
||||||
BuildRequires: scons
|
BuildRequires: scons
|
||||||
|
@ -56,6 +53,9 @@ Images, sound, and game data for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%ifarch ppc64le
|
||||||
|
sed -i 's/std=c++11/std=gnu++11/' SConstruct
|
||||||
|
%endif
|
||||||
CCFLAGS="%{optflags}" \
|
CCFLAGS="%{optflags}" \
|
||||||
LDFLAGS="%{?__global_ldflags}" \
|
LDFLAGS="%{?__global_ldflags}" \
|
||||||
%{_bindir}/scons \
|
%{_bindir}/scons \
|
||||||
|
@ -112,6 +112,10 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 13 2017 Link Dupont <linkdupont@fedoraproject.org> - 0.9.8-2
|
||||||
|
- Remove GNU C++ extensions patch
|
||||||
|
- Only use GNU C++ extensions when building on ppc64le
|
||||||
|
|
||||||
* Mon Aug 21 2017 Link Dupont <linkdupont@fedoraproject.org> - 0.9.8-1
|
* Mon Aug 21 2017 Link Dupont <linkdupont@fedoraproject.org> - 0.9.8-1
|
||||||
- New upstream release (RH#1473666)
|
- New upstream release (RH#1473666)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue