Set CXXFLAGS and LDFLAGS in both %build and %install.
This commit is contained in:
parent
83da6d52c5
commit
869f775e6b
@ -2,7 +2,7 @@
|
||||
|
||||
Name: endless-sky
|
||||
Version: 0.9.4
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Space exploration, trading, and combat game
|
||||
|
||||
License: GPLv3
|
||||
@ -53,8 +53,12 @@ Images, sound, and game data for %{name}.
|
||||
|
||||
|
||||
%build
|
||||
CCFLAGS="%{optflags}" scons PREFIX=%{_prefix}
|
||||
|
||||
CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
|
||||
LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
||||
%{_bindir}/scons \
|
||||
%{?_smp_mflags} \
|
||||
PREFIX=%{_prefix} \
|
||||
DESTDIR=%{buildroot}
|
||||
|
||||
%check
|
||||
appstream-util validate-relax --nonet %{name}.appdata.xml
|
||||
@ -62,7 +66,13 @@ desktop-file-validate %{name}.desktop
|
||||
|
||||
|
||||
%install
|
||||
scons PREFIX=%{_prefix} DESTDIR=%{buildroot} install
|
||||
CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
|
||||
LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
||||
%{_bindir}/scons \
|
||||
%{?_smp_mflags} \
|
||||
PREFIX=%{_prefix} \
|
||||
DESTDIR=%{buildroot} \
|
||||
install
|
||||
install -m644 -D endless-sky.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
|
||||
|
||||
|
||||
@ -100,6 +110,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 31 2016 Link Dupont <linkdupont@fedoraproject.org> - 0.9.4-3
|
||||
- Build and install with identical CXXFLAGS (RH#1402807)
|
||||
|
||||
* Thu Dec 8 2016 Link Dupont <linkdupont@fedoraproject.org> - 0.9.4-2
|
||||
- Build with $RPM_OPT_FLAGS (#1402807)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user