From feac92fee3e171ed5cdb1906fec7e7aefd8bb815 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 28 Jun 2015 12:11:54 +0200
Subject: [PATCH] - fix building on x32

---
 framewave.spec            |  6 ++++--
 no-forced-arch-bits.patch | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 no-forced-arch-bits.patch

diff --git a/framewave.spec b/framewave.spec
index b69218a..8728c64 100644
--- 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
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]
+ dctCCFlags[r'-msse3']        = [[ss2,f10]]
+ 
+-dctCCFlags[r'-m32']          = [b32]
+-dctCCFlags[r'-m64']          = [b64]
+-
+ dctCCFlags[r'-g']            = [dbg]
+ 
+ dctCCFlags[r'-Werror']       = []
+@@ -62,8 +59,6 @@
+ 
+ 
+ dctLDFlags[r'-lrt -pthread -lm -Wl -hlib${PROJECTNAME}.so.1'] = [shr, sol]
+-dctLDFlags[r'-m32']          = [b32]
+-dctLDFlags[r'-m64']          = [b64]
+ 
+ 
+ dctLDFlags['-install_name /usr/local/lib/${BITNESS}'+ \
-- 
2.43.0