From f06395f0fb91f6a3647f1e0ad6ee18c59d9549e263181a3cfa012babd38e1fe3 Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Sat, 24 Feb 2018 19:08:01 +0000 Subject: [PATCH] Accepting request 578553 from home:StefanBruens:branches:devel:libraries:c_c++ Enable for PPC/ARM, cleanup - Drop ExclusiveArch, Vc 1.3.3 is no longer x86 only Add default_to_scalar_implementation_for_unknown_arch.patch - Split documentation to subpackage - Drop redundant %doc in front of %_docdir - Remove unneeded fdupes BuildRequires OBS-URL: https://build.opensuse.org/request/show/578553 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Vc?expand=0&rev=23 --- Vc.changes | 9 ++++++ Vc.spec | 31 ++++++++++++++----- ...alar_implementation_for_unknown_arch.patch | 12 +++++++ 3 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 default_to_scalar_implementation_for_unknown_arch.patch diff --git a/Vc.changes b/Vc.changes index 8ad2a1a..acacdeb 100644 --- a/Vc.changes +++ b/Vc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 20 20:46:38 UTC 2018 - stefan.bruens@rwth-aachen.de + +- Drop ExclusiveArch, Vc 1.3.3 is no longer x86 only + Add default_to_scalar_implementation_for_unknown_arch.patch +- Split documentation to subpackage +- Drop redundant %doc in front of %_docdir +- Remove unneeded fdupes BuildRequires + ------------------------------------------------------------------- Thu Feb 15 19:13:43 UTC 2018 - asterios.dramis@gmail.com diff --git a/Vc.spec b/Vc.spec index b283044..b0f7a2f 100644 --- a/Vc.spec +++ b/Vc.spec @@ -27,11 +27,11 @@ Url: https://github.com/VcDevel/Vc/ Source0: https://github.com/VcDevel/Vc/releases/download/%{version}/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM fix_i686_build.patch asterios.dramis@gmail.com -- Fix i686 build Patch0: fix_i686_build.patch +# PATCH-FIX-SUSE default_to_scalar_implementation_for_unknown_arch.patch stefan.bruens@rwth-aachen.de -- fix PPC build +Patch1: default_to_scalar_implementation_for_unknown_arch.patch BuildRequires: cmake BuildRequires: doxygen -BuildRequires: fdupes BuildRequires: gcc-c++ -ExclusiveArch: %{ix86} x86_64 %description Vc is a free software library to ease explicit vectorization of C++ code. It @@ -51,6 +51,19 @@ sets. This package provides development headers needed to build software using Vc. +%package devel-doc +Summary: API documentation for Vc +Group: Development/Libraries/C and C++ +BuildArch: noarch + +%description devel-doc +Vc is a free software library to ease explicit vectorization of C++ code. It +has an intuitive API and provides portability between different compilers and +compiler versions as well as portability between different vector instruction +sets. + +This package provides the API documentation + %package devel-static Summary: Vc Static Library Group: Development/Libraries/C and C++ @@ -67,6 +80,7 @@ This package provides the Vc static library. %prep %setup -q %patch0 -p1 +%patch1 -p0 %build %cmake \ @@ -81,15 +95,16 @@ cd .. %install %cmake_install -# Install devel docs (do it manually to fix also rpmlint warning "files-duplicate" with %%fdupes) -mkdir -p %{buildroot}%{_docdir}/%{name}-devel -cp -a doc/html/ %{buildroot}%{_docdir}/%{name}-devel/ +# Install devel docs +mkdir -p %{buildroot}%{_docdir}/%{name}-devel-doc/ +cp -a doc/html %{buildroot}%{_docdir}/%{name}-devel-doc/ -%fdupes -s %{buildroot} +%files devel-doc +%doc README.md +%{_docdir}/%{name}-devel-doc/ %files devel -%doc LICENSE README.md -%doc %{_docdir}/%{name}-devel/ +%doc LICENSE %{_includedir}/Vc/ %dir %{_libdir}/cmake %{_libdir}/cmake/Vc/ diff --git a/default_to_scalar_implementation_for_unknown_arch.patch b/default_to_scalar_implementation_for_unknown_arch.patch new file mode 100644 index 0000000..67a7b74 --- /dev/null +++ b/default_to_scalar_implementation_for_unknown_arch.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2018-02-20 21:40:23.851663534 +0100 ++++ CMakeLists.txt 2018-02-20 21:41:10.567838665 +0100 +@@ -149,7 +149,8 @@ + elseif(Vc_ARM) + list(APPEND _srcs src/support_dummy.cpp) + else() +- message(FATAL_ERROR "Unsupported target architecture '${CMAKE_SYSTEM_PROCESSOR}'. No support_???.cpp file exists for this architecture.") ++ message(STATUS "Unsupported target architecture '${CMAKE_SYSTEM_PROCESSOR}'. No support_???.cpp file exists for this architecture.") ++ list(APPEND _srcs src/support_dummy.cpp) + endif() + add_library(Vc STATIC ${_srcs}) + set_property(TARGET Vc APPEND PROPERTY COMPILE_OPTIONS ${libvc_compile_flags})