Accepting request 1274246 from science

OBS-URL: https://build.opensuse.org/request/show/1274246 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qcdloop?expand=0&rev=2
* Update to version 2.1.0.
2025-05-05 20:26:48 +00:00 · 2025-05-04 14:29:08 +00:00
8 changed files with 64 additions and 79 deletions
--- a/qcdloop-2.0.9.tar.gz
+++ b/qcdloop-2.0.9.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ffbd371658726054b903dce9a7855ac02b258eac59e2ee13524dda9e278f23b
-size 214697
--- a/qcdloop-2.1.0.tar.gz
+++ b/qcdloop-2.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75ac2d00231714210859d39c4beebce14f183707afe47f4550f33ef9f348b3c1
+size 216538
--- a/qcdloop-fix-conflicting-types.patch
+++ b/qcdloop-fix-conflicting-types.patch
@@ -1,8 +1,8 @@
-Index: qcdloop-2.0.5b1/src/types.cc
+Index: qcdloop-2.1.0/src/types.cc
 ===================================================================
--- qcdloop-2.0.5b1.orig/src/types.cc
-+++ qcdloop-2.0.5b1/src/types.cc
-@@ -13,7 +13,7 @@ namespace std
+--- qcdloop-2.1.0.orig/src/types.cc
+++ qcdloop-2.1.0/src/types.cc
+@@ -14,7 +14,7 @@ namespace std
   {
      char buf[200];
      std::ostringstream format;
--- a/qcdloop-quadmath-linking.patch
+++ b/qcdloop-quadmath-linking.patch
@@ -1,13 +0,0 @@
-Index: qcdloop-2.0.9/CMakeLists.txt
-===================================================================
--- qcdloop-2.0.9.orig/CMakeLists.txt
-+++ qcdloop-2.0.9/CMakeLists.txt
-@@ -86,7 +86,7 @@ add_library(qcdloop SHARED src/box.cc
-                          ${Headers}
- )
- 
-target_link_libraries(qcdloop)
-+target_link_libraries(qcdloop quadmath)
- install(FILES ${CMAKE_BINARY_DIR}/src/qcdloop-config
-   DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
-   GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--- a/qcdloop-remove-march-mtune-flags.patch
+++ b/qcdloop-remove-march-mtune-flags.patch
@@ -1,13 +0,0 @@
-Index: qcdloop-2.0.5b1/CMakeLists.txt
-===================================================================
--- qcdloop-2.0.5b1.orig/CMakeLists.txt
-+++ qcdloop-2.0.5b1/CMakeLists.txt
-@@ -20,7 +20,7 @@ set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS OFF)
- set(VERSION "\"${PROJECT_VERSION}\"")
-set(CMAKE_CXX_FLAGS "-Wall -Wextra -march=nocona -mtune=haswell -fvisibility-inlines-hidden -fmessage-length=0 -ftree-vectorize -fPIC -fstack-protector-strong -O2 -pipe -fext-numeric-literals")
-+set(CMAKE_CXX_FLAGS "-Wall -Wextra -fvisibility-inlines-hidden -fmessage-length=0 -ftree-vectorize -fPIC -fstack-protector-strong -O2 -pipe -fext-numeric-literals")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -fPIC ${CMAKE_CXX_FLAGS}" CACHE STRING "debug compile flags" FORCE)
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fsanitize=address" CACHE STRING "debug linker flags" FORCE)
- 
--- a/qcdloop-soversion.patch
+++ b/qcdloop-soversion.patch
@@ -1,54 +1,35 @@
-Index: qcdloop-2.0.9/CMakeLists.txt
+Index: qcdloop-2.1.0/CMakeLists.txt
 ===================================================================
--- qcdloop-2.0.9.orig/CMakeLists.txt
-+++ qcdloop-2.0.9/CMakeLists.txt
-@@ -14,19 +14,22 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CO
+--- qcdloop-2.1.0.orig/CMakeLists.txt
+++ qcdloop-2.1.0/CMakeLists.txt
+@@ -14,12 +14,12 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CO
     "MinSizeRel" "RelWithDebInfo")
 endif()
 
 -project(qcdloop)
-+project(qcdloop VERSION 2.0.9)
- 
+project(qcdloop VERSION 2.1.0)
+ include(GNUInstallDirs)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(VERSION "\"2.0.9\"")
-+set(VERSION "\"${PROJECT_VERSION}\"")
- set(CMAKE_CXX_FLAGS "-Wall -Wextra -march=nocona -mtune=haswell -fvisibility-inlines-hidden -fmessage-length=0 -ftree-vectorize -fPIC -fstack-protector-strong -O2 -pipe -fext-numeric-literals")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -fPIC ${CMAKE_CXX_FLAGS}" CACHE STRING "debug compile flags" FORCE)
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fsanitize=address" CACHE STRING "debug linker flags" FORCE)
-+
-+include(GNUInstallDirs)
-+
- set(prefix ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix "${prefix}")
- set(includedir "${prefix}/include")
-set(libdir "${prefix}/lib")
-+set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
+-set(VERSION 2.1.0)
+set(VERSION ${PROJECT_VERSION})
 
- configure_file(
-   "${PROJECT_SOURCE_DIR}/src/qcdloop/config.h.in"
-@@ -87,12 +90,14 @@ add_library(qcdloop SHARED src/box.cc
+ # Set default CXXFLAGS but allow for environment override
+ # c.f. https://cmake.org/cmake/help/v3.31/envvar/CXXFLAGS.html
+@@ -113,6 +113,8 @@ add_library(qcdloop SHARED src/box.cc
 )
 
- target_link_libraries(qcdloop quadmath)
+ target_link_libraries(qcdloop ${QUADMATH_LIBRARY})
 +set_target_properties(qcdloop PROPERTIES VERSION ${PROJECT_VERSION})
 +set_target_properties(qcdloop PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
 install(FILES ${CMAKE_BINARY_DIR}/src/qcdloop-config
   DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
   GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(FILES ${PROJECT_SOURCE_DIR}/src/qcdloop.pc DESTINATION lib/pkgconfig)
-+install(FILES ${PROJECT_SOURCE_DIR}/src/qcdloop.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- install(DIRECTORY src/qcdloop DESTINATION include)
-install(TARGETS qcdloop DESTINATION lib)
-+install(TARGETS qcdloop LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- # enable disable fortran/wrapper (to avoid name conflicts with ql1.x)
- option(ENABLE_FORTRAN_WRAPPER "Enable fortran wrapper" ON)
-Index: qcdloop-2.0.9/src/qcdloop.pc.in
+Index: qcdloop-2.1.0/src/qcdloop.pc.in
 ===================================================================
--- qcdloop-2.0.9.orig/src/qcdloop.pc.in
-+++ qcdloop-2.0.9/src/qcdloop.pc.in
+--- qcdloop-2.1.0.orig/src/qcdloop.pc.in
+++ qcdloop-2.1.0/src/qcdloop.pc.in
@@ -5,6 +5,6 @@ libdir=@libdir@
 
 Name: nnpdf
--- a/qcdloop.changes
+++ b/qcdloop.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Apr 30 14:21:18 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 2.1.0:
+  * Add one more QUADMATH lookup path [gh#scarrazza/qcdloop#31].
+  * Add support for aarch64 [gh#scarrazza/qcdloop#34].
+- Changes from version 2.0.11:
+  * fix: Allow for environment override of CMAKE_CXX_FLAGS
+    [gh#scarrazza/qcdloop#29].
+- Changes from version 2.0.10:
+  * Fix an off-by-one error in Tools::ddilog
+    [gh#scarrazza/qcdloop#24].
+  * fix: Use 'grep -E' over 'egrep' [gh#scarrazza/qcdloop#25].
+  * Small cmake updates [gh#scarrazza/qcdloop#23].
+- Drop patches incorporated upstream:
+  * qcdloop-quadmath-linking.patch
+  * qcdloop-remove-march-mtune-flags.patch
+- Re-base qcdloop-soversion.patch for update.
+- Allow building for aarch64 as this is now allowed by upstream
+  [gh#scarrazza/qcdloop#34]; still no support for ppc or power64,
+  so these remain excluded.
+- Implement %check section to run tests (only for %ix86, x86_64).
+
 -------------------------------------------------------------------
 Tue Dec  6 10:10:40 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>

--- a/qcdloop.spec
+++ b/qcdloop.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qcdloop
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,26 +18,21 @@

 %global shlib libqcdloop2
 Name:           qcdloop
-Version:        2.0.9
+Version:        2.1.0
 Release:        0
 Summary:        An object-oriented one-loop scalar Feynman integrals framework
 License:        GPL-3.0-only
 URL:            https://qcdloop.web.cern.ch/qcdloop/
 Source:         https://github.com/scarrazza/qcdloop/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM qcdloop-math-linking.patch badshah400@gmail.com -- Explicitly link to math library to fix linking error when linking with --Wl,no-undefined
-Patch0:         qcdloop-quadmath-linking.patch
 # PATCH-FIX-UPSTREAM qcdloop-soversion.patch badshah400@gmail.com -- Implement so versioning
 Patch1:         qcdloop-soversion.patch
 # PATCH-FIX-UPSTREAM qcdloop-fix-conflicting-types.patch badshah400@gmail.com -- Explicitly cast a variable type to ensure consistency across build archs; fixes build failures for i586
 Patch2:         qcdloop-fix-conflicting-types.patch
-# PATCH-FEATURE-OPENSUSE qcdloop-remove-march-mtune-flags.patch badshah400@gmail.com -- Drop march and mtune flags being passed to the c++ compiler to enable building on multiple archs
-Patch3:         qcdloop-remove-march-mtune-flags.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
 BuildRequires:  pkgconfig
-# Doesn't build on aarch64, ppc64* due to no quadmath
-ExcludeArch:    aarch64 %power64
+ExcludeArch:    ppc %{power64}

 %description
 QCDLoop is a library of one-loop scalar Feynman integrals, evaluated close to
@@ -67,16 +62,28 @@ sed -i "1{s|#! %{_bindir}/env bash|#! /bin/bash|}"  src/qcdloop-config.in

 %build
 %cmake \
+%ifarch %{ix86} x86_64
+  -DQUADMATH_LIBRARY=quadmath \
  -DENABLE_EXAMPLES:BOOL=ON \
-  -DENABLE_FORTRAN_WRAPPER:BOOL=ON
-
+%endif
+  -DENABLE_FORTRAN_WRAPPER:BOOL=ON \
+  %{nil}
 %cmake_build

 %install
 %cmake_install

-%post -n %{shlib} -p /sbin/ldconfig
-%postun -n %{shlib} -p /sbin/ldconfig
+%ifarch %{ix86} x86_64
+%check
+pushd %__builddir
+for exe in ./cache_test ./cmass_test ./trigger_test;
+do
+  exec ${exe}
+done
+popd
+%endif
+
+%ldconfig_scriptlets -n %{shlib}

 %files -n %{shlib}
 %{_libdir}/libqcdloop.so.*