From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 28 Jun 2015 10:17:54 +0000 (+0200)
Subject: - don't force m32/m64 build mode
X-Git-Tag: auto/th/tbb-4.3.20150611-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftbb.git;a=commitdiff_plain;h=5d11029

- don't force m32/m64 build mode
- added x32 to supported archs
- rel 2
---

diff --git a/no-forced-arch-bits.patch b/no-forced-arch-bits.patch
new file mode 100644
index 0000000..3e2e1e9
--- /dev/null
+++ b/no-forced-arch-bits.patch
@@ -0,0 +1,19 @@
+--- tbb43_20150611oss/build/linux.gcc.inc~	2015-06-28 12:13:13.000000000 +0200
++++ tbb43_20150611oss/build/linux.gcc.inc	2015-06-28 12:14:51.385001671 +0200
+@@ -74,14 +74,12 @@
+ 
+ ifeq (intel64,$(arch))
+     ITT_NOTIFY = -DDO_ITT_NOTIFY
+-    CPLUS_FLAGS += -m64 $(RTM_KEY)
+-    LIB_LINK_FLAGS += -m64
++    CPLUS_FLAGS += $(RTM_KEY)
+ endif
+ 
+ ifeq (ia32,$(arch))
+     ITT_NOTIFY = -DDO_ITT_NOTIFY
+-    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
+-    LIB_LINK_FLAGS += -m32
++    CPLUS_FLAGS += $(RTM_KEY)
+ endif
+ 
+ ifeq (ppc64,$(arch))
diff --git a/tbb.spec b/tbb.spec
index 8b9e658..398323d 100644
--- a/tbb.spec
+++ b/tbb.spec
@@ -1,4 +1,4 @@
-%define		major 	4
+%define		major	4
 %define		minor	3
 %define		micro	20150611
 %define		sourcebasename tbb%{major}%{minor}_%{micro}oss
@@ -6,7 +6,7 @@ Summary:	The Threading Building Blocks library abstracts low-level threading det
 Summary(pl.UTF-8):	Threading Building Blocks - biblioteka abstrahująca niskopoziomowe szczegóły obsługi wątków
 Name:		tbb
 Version:	%{major}.%{minor}.%{micro}
-Release:	1
+Release:	2
 License:	GPL v2 with runtime exception
 Group:		Development/Tools
 # Source0Download: https://www.threadingbuildingblocks.org/download
@@ -23,6 +23,7 @@ Source4:	http://www.threadingbuildingblocks.org/uploads/81/91/Latest%20Open%20So
 Source5:	%{name}.pc.in
 Source6:	%{name}malloc.pc.in
 Source7:	%{name}malloc_proxy.pc.in
+Patch0:		no-forced-arch-bits.patch
 Patch1:		%{name}-cxxflags.patch
 Patch2:		mfence.patch
 URL:		http://www.threadingbuildingblocks.org/
@@ -31,7 +32,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 # We need "arch" binary:
 BuildRequires:	util-linux
-ExclusiveArch:	%{ix86} %{x8664} %{arm} ia64 ppc ppc64
+ExclusiveArch:	%{ix86} %{x8664} x32 %{arm} ia64 ppc ppc64
 # __TBB_machine_cmpswp8 uses gcc's __sync_val_compare_and_swap8 or directly cmpxchg8b asm instruction
 ExcludeArch:	i386 i486
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,6 +89,7 @@ Building Blocks (TBB).
 
 %prep
 %setup -q -n %{sourcebasename}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -95,8 +97,6 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
 cp -p %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
-sed -i -e 's/-march=pentium4//' build/linux.gcc.inc
-
 %build
 %{__make} \
 	CPLUS="%{__cxx}" \