From f5a3326d97b5bd38546fb1c7e0d6f943a7cba8d83f79e75d956222000e847078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Dec 2017 12:21:29 +0000 Subject: [PATCH] - Add disable-irml.patch to disable linking to libirml - Actually update to tarball to 2018_U2 release OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=41 --- disable-irml.patch | 13 +++++++++++++ tbb.changes | 6 ++++++ tbb.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 disable-irml.patch diff --git a/disable-irml.patch b/disable-irml.patch new file mode 100644 index 0000000..bef2472 --- /dev/null +++ b/disable-irml.patch @@ -0,0 +1,13 @@ +Index: tbb-2018_U2/python/setup.py +=================================================================== +--- tbb-2018_U2.orig/python/setup.py ++++ tbb-2018_U2/python/setup.py +@@ -71,7 +71,7 @@ _tbb = Extension("tbb._api", ["tbb/api.i + extra_compile_args=compile_flags + tbb_flag, + extra_link_args=tbb_flag, + libraries =(['tbb'] if not use_compiler_tbb else []) + +- (['irml'] if platform.system() == "Linux" else []), # TODO: why do we need this? ++ (['irml'] if platform.system() == "xLinux" else []), # TODO: why do we need this? + library_dirs=[ rundir, # for custom-builds + os.path.join(tbb_root, 'lib', 'intel64', 'gcc4.4'), # for Linux + os.path.join(tbb_root, 'lib'), # for MacOS diff --git a/tbb.changes b/tbb.changes index 7b392ad..811d88c 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 21 12:20:59 UTC 2017 - idonmez@suse.com + +- Add disable-irml.patch to disable linking to libirml +- Actually update to tarball to 2018_U2 release + ------------------------------------------------------------------- Sat Dec 16 15:29:08 UTC 2017 - idonmez@suse.com diff --git a/tbb.spec b/tbb.spec index 9bbc6c3..e65ccc9 100644 --- a/tbb.spec +++ b/tbb.spec @@ -30,6 +30,8 @@ Source0: https://github.com/01org/tbb/archive/2018_U2.tar.gz Patch1: optflags.patch # PATCH-FIX-OPENSUSE reproducible.patch -- Do not compile build hostname+kernel into binary Patch2: reproducible.patch +# PATCH-FIX-OPENSUSE disable-irml.patch -- Don't try to link to irml +Patch3: disable-irml.patch BuildRequires: gcc-c++ BuildRequires: python2-devel BuildRequires: python3-devel @@ -107,6 +109,7 @@ This package contains the header files needed for development with tbb. %setup -q -n %{name}-%{rel_ver} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make OPTFLAGS="%{optflags}" %{?_smp_mflags} tbb_build_prefix=obj