[bristol] Fix compilation on platforms where we don't support SSE
Peter Robinson
pbrobinson at fedoraproject.org
Thu Jul 5 15:02:40 UTC 2012
commit d5372564e162e8d651b456f552cc0fbc86ff1e54
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Jul 5 16:02:38 2012 +0100
Fix compilation on platforms where we don't support SSE
bristol.spec | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/bristol.spec b/bristol.spec
index 7d5f0f0..8dbb9f6 100644
--- a/bristol.spec
+++ b/bristol.spec
@@ -1,6 +1,6 @@
Name: bristol
Version: 0.60.10
-Release: 1%{dist}
+Release: 2%{dist}
Summary: Synthesizer emulator
Group: Applications/Multimedia
@@ -11,7 +11,6 @@ Source1: %{name}.desktop
Patch0: bristol-0.60.9-CVE-2010-3351.patch
# fix build on non-x86 arches (remove compiler options from linker flags)
Patch1: bristol-0.60.9-secondary.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel alsa-lib-devel jack-audio-connection-kit-devel desktop-file-utils
@@ -44,6 +43,12 @@ find . -name '*.svg' | xargs chmod -x
chmod -x NEWS COPYING* README AUTHORS ChangeLog
chmod -x memory/mixer/default/memory memory/mini/readme.txt
+# Only x86_64 is optimised for SSE, non x86 platforms don't have SSE
+%ifnarch x86_64
+sed -i.sse 's/-msse -mfpmath=sse //g' bristol/Makefile.am
+sed -i.sse 's/-msse -mfpmath=sse //g' bristol/Makefile.in
+%endif
+
%build
%configure --enable-static=no --disable-version-check
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -52,7 +57,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm INSTALL
@@ -68,9 +72,6 @@ desktop-file-install \
%postun -p /sbin/ldconfig
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING* NEWS README
@@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lib*.so
%changelog
+* Thu Jul 5 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.60.10-2
+- Fix compilation on platforms where we don't support SSE
+
* Tue Jun 05 2012 Jon Ciesla <limburgher at gmail.com> - 0.60.10-1
- New upstream.
More information about the scm-commits
mailing list