Fix CCFLAGS override within SConstruct
This commit is contained in:
parent
9b26a324e4
commit
9c4b72f3e5
|
@ -0,0 +1,19 @@
|
||||||
|
diff -up ./SConstruct.orig ./SConstruct
|
||||||
|
--- ./SConstruct.orig 2017-01-01 22:16:40.914893288 -0800
|
||||||
|
+++ ./SConstruct 2017-01-01 22:22:26.934720111 -0800
|
||||||
|
@@ -22,14 +22,7 @@ opts.Update(env)
|
||||||
|
|
||||||
|
Help(opts.GenerateHelpText(env))
|
||||||
|
|
||||||
|
-flags = ["-std=gnu++11", "-Wall"]
|
||||||
|
-if env["mode"] != "debug":
|
||||||
|
- flags += ["-O3"]
|
||||||
|
-if env["mode"] == "debug":
|
||||||
|
- flags += ["-g"]
|
||||||
|
-if env["mode"] == "profile":
|
||||||
|
- flags += ["-pg"]
|
||||||
|
- env.Append(LINKFLAGS = ["-pg"])
|
||||||
|
+flags = ["-std=gnu++11"]
|
||||||
|
|
||||||
|
# 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.
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: endless-sky
|
Name: endless-sky
|
||||||
Version: 0.9.4
|
Version: 0.9.4
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Space exploration, trading, and combat game
|
Summary: Space exploration, trading, and combat game
|
||||||
|
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
|
@ -16,6 +16,8 @@ Patch0: endless-sky-0.8.10-remove-games-path.patch
|
||||||
# Use gnu++11 standard instead of c++11. Fixes a FTBFS issue on ppc64le.
|
# Use gnu++11 standard instead of c++11. Fixes a FTBFS issue on ppc64le.
|
||||||
# https://github.com/endless-sky/endless-sky/pull/1804
|
# https://github.com/endless-sky/endless-sky/pull/1804
|
||||||
Patch1: endless-sky-0.9.4-std-gnu++11.patch
|
Patch1: endless-sky-0.9.4-std-gnu++11.patch
|
||||||
|
# Unset CCFLAGS override inside SConstruct.
|
||||||
|
Patch2: endless-sky-0.9.4-remove-additional-ccflags.patch
|
||||||
|
|
||||||
Requires: %{name}-data = %{version}-%{release}
|
Requires: %{name}-data = %{version}-%{release}
|
||||||
BuildRequires: scons
|
BuildRequires: scons
|
||||||
|
@ -53,8 +55,8 @@ Images, sound, and game data for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CCFLAGS="${CCFLAGS:-%__global_cflags}" \
|
CCFLAGS="%{optflags}" \
|
||||||
LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
LDFLAGS="%{?__global_ldflags}" \
|
||||||
%{_bindir}/scons \
|
%{_bindir}/scons \
|
||||||
%{?_smp_mflags} \
|
%{?_smp_mflags} \
|
||||||
PREFIX=%{_prefix} \
|
PREFIX=%{_prefix} \
|
||||||
|
@ -66,8 +68,8 @@ desktop-file-validate %{name}.desktop
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
CCFLAGS="${CCFLAGS:-%__global_cflags}" \
|
CCFLAGS="%{optflags}" \
|
||||||
LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
LDFLAGS="%{?__global_ldflags}" \
|
||||||
%{_bindir}/scons \
|
%{_bindir}/scons \
|
||||||
%{?_smp_mflags} \
|
%{?_smp_mflags} \
|
||||||
PREFIX=%{_prefix} \
|
PREFIX=%{_prefix} \
|
||||||
|
@ -110,6 +112,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jan 1 2017 Link Dupont <linkdupont@fedoraproject.org> - 0.9.4-4
|
||||||
|
- Remove CCFLAGS override inside SConstruct
|
||||||
|
|
||||||
* Sat Dec 31 2016 Link Dupont <linkdupont@fedoraproject.org> - 0.9.4-3
|
* Sat Dec 31 2016 Link Dupont <linkdupont@fedoraproject.org> - 0.9.4-3
|
||||||
- Build and install with identical CXXFLAGS (RH#1402807)
|
- Build and install with identical CXXFLAGS (RH#1402807)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue