Hello community, here is the log from the commit of package splinter for openSUSE:Factory checked in at 2018-04-20 17:31:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/splinter (Old) and /work/SRC/openSUSE:Factory/.splinter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "splinter" Fri Apr 20 17:31:41 2018 rev:2 rq:598816 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/splinter/splinter.changes 2017-08-30 16:24:34.973845004 +0200 +++ /work/SRC/openSUSE:Factory/.splinter.new/splinter.changes 2018-04-20 17:33:59.228710504 +0200 @@ -1,0 +2,6 @@ +Tue Apr 17 14:59:52 UTC 2018 - [email protected] + +- Add upstream_add_armv8.patch and update spec to fix build for aarch64 +- Restrict build to x86* and aarch64 + +------------------------------------------------------------------- New: ---- upstream_add_armv8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splinter.spec ++++++ --- /var/tmp/diff_new_pack.ez3RmT/_old 2018-04-20 17:34:00.124678011 +0200 +++ /var/tmp/diff_new_pack.ez3RmT/_new 2018-04-20 17:34:00.128677866 +0200 @@ -1,7 +1,7 @@ # # spec file for package splinter # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Group: Productivity/Scientific/Math Url: https://github.com/bgrimstad/splinter Source: https://github.com/bgrimstad/%{name}/archive/v%{version}.tar.gz +# PATCH-FIX-UPSTREAM: upstream_add_armv8.patch -- add support to aarch64 (armv8) +Patch0: upstream_add_armv8.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -33,6 +35,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %{ix86} x86_64 aarch64 %description SPLINTER (SPLine INTERpolation) is a library for multivariate function @@ -84,6 +87,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake \ @@ -91,8 +95,12 @@ %ifarch x86_64 -DARCH="x86-64" %else +%ifarch aarch64 + -DARCH="armv8" +%else -DARCH="x86" %endif +%endif %make_jobs all doc ++++++ upstream_add_armv8.patch ++++++ >From 7ba1050efe7a79181d30337efe957100b4bdaac8 Mon Sep 17 00:00:00 2001 From: Mark Cutler <[email protected]> Date: Thu, 22 Feb 2018 11:27:52 -0800 Subject: [PATCH] adding optional support for armv8 by removing bitness compiler flag --- CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1d3154..7798969 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,12 +59,18 @@ endif() # Set bitness if(${ARCH} STREQUAL "x86-64") - set(BITNESS "64") + set(BITNESS "64") + set(BITNESS_FLAG "-m${BITNESS}") elseif(${ARCH} STREQUAL "x86") - set(BITNESS "32") + set(BITNESS "32") + set(BITNESS_FLAG "-m${BITNESS}") +elseif(${ARCH} STREQUAL "armv8") + set(BITNESS "64") + set(BITNESS_FLAG "") else() set(BITNESS "32") set(ARCH "x86") + set(BITNESS_FLAG "-m${BITNESS}") message("Unknown architecture selected, defaulting to x86") endif() @@ -91,7 +97,7 @@ if(WINDOWS AND GCC) # -fipa-cp-clone causes a SegFault in Eigen when enabled with MinGW i686 4.9.2 with dwarf exception model #set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fipa-cp-clone") endif() - + # To avoid an external dependency (libgcc_s_seh11.dll or libgcc_s_dw2-1.dll) # we statically link the libraries required by MinGW runtimes set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -static") @@ -110,11 +116,11 @@ if(MSVC) elseif(GCC OR CLANG) # Treat warning return-type as error to avoid undefined behaviour # when a non-void function does not return a value. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${BITNESS} -std=c++11 -Werror=return-type") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${BITNESS_FLAG} -std=c++11 -Werror=return-type") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-long-long") elseif(INTEL) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${BITNESS} -std=c++11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${BITNESS_FLAG} -std=c++11") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall") endif() @@ -299,7 +305,7 @@ if(DOXYGEN_FOUND) ${PROJECT_BINARY_DIR}/Doxyfile COMMENT "Generating API documentation with Doxygen" VERBATIM) - + endif() if(CMAKE_BUILD_TYPE STREQUAL DEBUG)
