- fix building on x32

diff --git a/framewave.spec b/framewave.spec
index b69218a2ccfb8b958e57616cb626d2d0718a9214..8728c64dc68eff180ef4d8d9c5ba4283428cb349 100644 (file)
--- a/framewave.spec
+++ b/framewave.spec
@@ -13,13 +13,14 @@ Source0:    http://downloads.sourceforge.net/framewave/FRAMEWAVE_%{version}_SRC.tar
 # Source0-md5: 86a28ebfbfd70be06ab54d0d8b17ebd7
 Patch0:                %{name}-system-boost.patch
 Patch1:                %{name}-c++.patch
+Patch2:                no-forced-arch-bits.patch
 URL:           http://framewave.sourceforge.net/
 BuildRequires: boost-devel >= 1.34
 BuildRequires: libstdc++-devel
 BuildRequires: rpmbuild(macros) >= 1.385
 BuildRequires: scons
 BuildRequires: sed >= 4.0
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,6 +67,7 @@ Statyczne biblioteki Framewave.
 %setup -q -n FRAMEWAVE_%{version}_SRC
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # kill precompiled binaries
 %{__rm} BuildTools/bin/FwHeaderConvert_*
@@ -77,7 +79,7 @@ cd Framewave
 mkdir -p build/{include,tmp,bin}
 for kind in shared %{?with_static_libs:static} ; do
 %scons \
-%ifarch %{x8664}
+%ifarch %{x8664} x32
        bitness=64 \
 %else
        bitness=32 \

diff --git a/no-forced-arch-bits.patch b/no-forced-arch-bits.patch
new file mode 100644 (file)
index 0000000..fd73cb0
--- /dev/null
+++ b/no-forced-arch-bits.patch
@@ -0,0 +1,21 @@
+--- FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwflags_gcc.py~        2015-06-28 11:42:44.000000000 +0200
++++ FRAMEWAVE_1.3.1_SRC/BuildTools/buildscripts/fwflags_gcc.py 2015-06-28 11:44:30.087654112 +0200
+@@ -27,9 +27,6 @@
+ dctCCFlags[r'-msse2']        = [ss2]\r
+ dctCCFlags[r'-msse3']        = [[ss2,f10]]\r
+ \r
+-dctCCFlags[r'-m32']          = [b32]\r
+-dctCCFlags[r'-m64']          = [b64]\r
+-\r
+ dctCCFlags[r'-g']            = [dbg]\r
+ \r
+ dctCCFlags[r'-Werror']       = []\r
+@@ -62,8 +59,6 @@
+ \r
+ \r
+ dctLDFlags[r'-lrt -pthread -lm -Wl -hlib${PROJECTNAME}.so.1'] = [shr, sol]\r
+-dctLDFlags[r'-m32']          = [b32]\r
+-dctLDFlags[r'-m64']          = [b64]\r
+ \r
+ \r
+ dctLDFlags['-install_name /usr/local/lib/${BITNESS}'+ \\r