diff --git a/trng-4.24.tar.gz b/trng-4.24.tar.gz deleted file mode 100644 index 0df40d3..0000000 --- a/trng-4.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92dd7ab4de95666f453b4fef04827fa8599d93a3e533cdc604782c15edd0c13c -size 1459275 diff --git a/trng-4.25.tar.gz b/trng-4.25.tar.gz new file mode 100644 index 0000000..840cd47 --- /dev/null +++ b/trng-4.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2727ce04e726a0b214e7bc8066793489b1ddce2fdf932d63313f4fd2823c9beb +size 1462898 diff --git a/trng-drop-findtbb-cmake-module.patch b/trng-drop-findtbb-cmake-module.patch deleted file mode 100644 index 398f628..0000000 --- a/trng-drop-findtbb-cmake-module.patch +++ /dev/null @@ -1,308 +0,0 @@ -Index: trng4-4.24/cmake/FindTBB.cmake -=================================================================== ---- trng4-4.24.orig/cmake/FindTBB.cmake -+++ /dev/null -@@ -1,303 +0,0 @@ --# The MIT License (MIT) --# --# Copyright (c) 2015 Justus Calvin --# --# Permission is hereby granted, free of charge, to any person obtaining a copy --# of this software and associated documentation files (the "Software"), to deal --# in the Software without restriction, including without limitation the rights --# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --# copies of the Software, and to permit persons to whom the Software is --# furnished to do so, subject to the following conditions: --# --# The above copyright notice and this permission notice shall be included in all --# copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --# SOFTWARE. -- --# --# FindTBB --# ------- --# --# Find TBB include directories and libraries. --# --# Usage: --# --# find_package(TBB [major[.minor]] [EXACT] --# [QUIET] [REQUIRED] --# [[COMPONENTS] [components...]] --# [OPTIONAL_COMPONENTS components...]) --# --# where the allowed components are tbbmalloc and tbb_preview. Users may modify --# the behavior of this module with the following variables: --# --# * TBB_ROOT_DIR - The base directory the of TBB installation. --# * TBB_INCLUDE_DIR - The directory that contains the TBB headers files. --# * TBB_LIBRARY - The directory that contains the TBB library files. --# * TBB__LIBRARY - The path of the TBB the corresponding TBB library. --# These libraries, if specified, override the --# corresponding library search results, where --# may be tbb, tbb_debug, tbbmalloc, tbbmalloc_debug, --# tbb_preview, or tbb_preview_debug. --# * TBB_USE_DEBUG_BUILD - The debug version of tbb libraries, if present, will --# be used instead of the release version. --# --# Users may modify the behavior of this module with the following environment --# variables: --# --# * TBB_INSTALL_DIR --# * TBBROOT --# * LIBRARY_PATH --# --# This module will set the following variables: --# --# * TBB_FOUND - Set to false, or undefined, if we haven’t found, or --# don’t want to use TBB. --# * TBB__FOUND - If False, optional part of TBB sytem is --# not available. --# * TBB_VERSION - The full version string --# * TBB_VERSION_MAJOR - The major version --# * TBB_VERSION_MINOR - The minor version --# * TBB_INTERFACE_VERSION - The interface version number defined in --# tbb/tbb_stddef.h. --# * TBB__LIBRARY_RELEASE - The path of the TBB release version of --# , where may be tbb, tbb_debug, --# tbbmalloc, tbbmalloc_debug, tbb_preview, or --# tbb_preview_debug. --# * TBB__LIBRARY_DEGUG - The path of the TBB release version of --# , where may be tbb, tbb_debug, --# tbbmalloc, tbbmalloc_debug, tbb_preview, or --# tbb_preview_debug. --# --# The following varibles should be used to build and link with TBB: --# --# * TBB_INCLUDE_DIRS - The include directory for TBB. --# * TBB_LIBRARIES - The libraries to link against to use TBB. --# * TBB_LIBRARIES_RELEASE - The release libraries to link against to use TBB. --# * TBB_LIBRARIES_DEBUG - The debug libraries to link against to use TBB. --# * TBB_DEFINITIONS - Definitions to use when compiling code that uses --# TBB. --# * TBB_DEFINITIONS_RELEASE - Definitions to use when compiling release code that --# uses TBB. --# * TBB_DEFINITIONS_DEBUG - Definitions to use when compiling debug code that --# uses TBB. --# --# This module will also create the "tbb" target that may be used when building --# executables and libraries. -- --include(FindPackageHandleStandardArgs) -- --if(NOT TBB_FOUND) -- -- ################################## -- # Check the build type -- ################################## -- -- if(NOT DEFINED TBB_USE_DEBUG_BUILD) -- if(CMAKE_BUILD_TYPE MATCHES "(Debug|DEBUG|debug|RelWithDebInfo|RELWITHDEBINFO|relwithdebinfo)") -- set(TBB_BUILD_TYPE DEBUG) -- else() -- set(TBB_BUILD_TYPE RELEASE) -- endif() -- elseif(TBB_USE_DEBUG_BUILD) -- set(TBB_BUILD_TYPE DEBUG) -- else() -- set(TBB_BUILD_TYPE RELEASE) -- endif() -- -- ################################## -- # Set the TBB search directories -- ################################## -- -- # Define search paths based on user input and environment variables -- set(TBB_SEARCH_DIR ${TBB_ROOT_DIR} $ENV{TBB_INSTALL_DIR} $ENV{TBBROOT}) -- -- # Define the search directories based on the current platform -- if(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- set(TBB_DEFAULT_SEARCH_DIR "C:/Program Files/Intel/TBB" -- "C:/Program Files (x86)/Intel/TBB") -- -- # Set the target architecture -- if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- set(TBB_ARCHITECTURE "intel64") -- else() -- set(TBB_ARCHITECTURE "ia32") -- endif() -- -- # Set the TBB search library path search suffix based on the version of VC -- if(WINDOWS_STORE) -- set(TBB_LIB_PATH_SUFFIX "lib/${TBB_ARCHITECTURE}/vc11_ui") -- elseif(MSVC14) -- set(TBB_LIB_PATH_SUFFIX "lib/${TBB_ARCHITECTURE}/vc14") -- elseif(MSVC12) -- set(TBB_LIB_PATH_SUFFIX "lib/${TBB_ARCHITECTURE}/vc12") -- elseif(MSVC11) -- set(TBB_LIB_PATH_SUFFIX "lib/${TBB_ARCHITECTURE}/vc11") -- elseif(MSVC10) -- set(TBB_LIB_PATH_SUFFIX "lib/${TBB_ARCHITECTURE}/vc10") -- endif() -- -- # Add the library path search suffix for the VC independent version of TBB -- list(APPEND TBB_LIB_PATH_SUFFIX "lib/${TBB_ARCHITECTURE}/vc_mt") -- -- elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") -- # OS X -- set(TBB_DEFAULT_SEARCH_DIR "/opt/intel/tbb") -- -- # TODO: Check to see which C++ library is being used by the compiler. -- if(NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 13.0) -- # The default C++ library on OS X 10.9 and later is libc++ -- set(TBB_LIB_PATH_SUFFIX "lib/libc++" "lib") -- else() -- set(TBB_LIB_PATH_SUFFIX "lib") -- endif() -- elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") -- # Linux -- set(TBB_DEFAULT_SEARCH_DIR "/opt/intel/tbb") -- -- # TODO: Check compiler version to see the suffix should be /gcc4.1 or -- # /gcc4.1. For now, assume that the compiler is more recent than -- # gcc 4.4.x or later. -- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- set(TBB_LIB_PATH_SUFFIX "lib/intel64/gcc4.4") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -- set(TBB_LIB_PATH_SUFFIX "lib/ia32/gcc4.4") -- endif() -- endif() -- -- ################################## -- # Find the TBB include dir -- ################################## -- -- find_path(TBB_INCLUDE_DIRS tbb/tbb.h -- HINTS ${TBB_INCLUDE_DIR} ${TBB_SEARCH_DIR} -- PATHS ${TBB_DEFAULT_SEARCH_DIR} -- PATH_SUFFIXES include) -- -- ################################## -- # Set version strings -- ################################## -- -- if(TBB_INCLUDE_DIRS) -- file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file) -- string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" -- TBB_VERSION_MAJOR "${_tbb_version_file}") -- string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" -- TBB_VERSION_MINOR "${_tbb_version_file}") -- string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" -- TBB_INTERFACE_VERSION "${_tbb_version_file}") -- set(TBB_VERSION "${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR}") -- endif() -- -- ################################## -- # Find TBB components -- ################################## -- -- if(TBB_VERSION VERSION_LESS 4.3) -- set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb) -- else() -- set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb) -- endif() -- -- # Find each component -- foreach(_comp ${TBB_SEARCH_COMPOMPONENTS}) -- if(";${TBB_FIND_COMPONENTS};tbb;" MATCHES ";${_comp};") -- -- # Search for the libraries -- find_library(TBB_${_comp}_LIBRARY_RELEASE ${_comp} -- HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR} -- PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH -- PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX}) -- -- find_library(TBB_${_comp}_LIBRARY_DEBUG ${_comp}_debug -- HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR} -- PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH -- PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX}) -- -- if(TBB_${_comp}_LIBRARY_DEBUG) -- list(APPEND TBB_LIBRARIES_DEBUG "${TBB_${_comp}_LIBRARY_DEBUG}") -- endif() -- if(TBB_${_comp}_LIBRARY_RELEASE) -- list(APPEND TBB_LIBRARIES_RELEASE "${TBB_${_comp}_LIBRARY_RELEASE}") -- endif() -- if(TBB_${_comp}_LIBRARY_${TBB_BUILD_TYPE} AND NOT TBB_${_comp}_LIBRARY) -- set(TBB_${_comp}_LIBRARY "${TBB_${_comp}_LIBRARY_${TBB_BUILD_TYPE}}") -- endif() -- -- if(TBB_${_comp}_LIBRARY AND EXISTS "${TBB_${_comp}_LIBRARY}") -- set(TBB_${_comp}_FOUND TRUE) -- else() -- set(TBB_${_comp}_FOUND FALSE) -- endif() -- -- # Mark internal variables as advanced -- mark_as_advanced(TBB_${_comp}_LIBRARY_RELEASE) -- mark_as_advanced(TBB_${_comp}_LIBRARY_DEBUG) -- mark_as_advanced(TBB_${_comp}_LIBRARY) -- -- endif() -- endforeach() -- -- ################################## -- # Set compile flags and libraries -- ################################## -- -- set(TBB_DEFINITIONS_RELEASE "") -- set(TBB_DEFINITIONS_DEBUG "-DTBB_USE_DEBUG=1") -- -- if(TBB_LIBRARIES_${TBB_BUILD_TYPE}) -- set(TBB_DEFINITIONS "${TBB_DEFINITIONS_${TBB_BUILD_TYPE}}") -- set(TBB_LIBRARIES "${TBB_LIBRARIES_${TBB_BUILD_TYPE}}") -- elseif(TBB_LIBRARIES_RELEASE) -- set(TBB_DEFINITIONS "${TBB_DEFINITIONS_RELEASE}") -- set(TBB_LIBRARIES "${TBB_LIBRARIES_RELEASE}") -- elseif(TBB_LIBRARIES_DEBUG) -- set(TBB_DEFINITIONS "${TBB_DEFINITIONS_DEBUG}") -- set(TBB_LIBRARIES "${TBB_LIBRARIES_DEBUG}") -- endif() -- -- find_package_handle_standard_args(TBB -- REQUIRED_VARS TBB_INCLUDE_DIRS TBB_LIBRARIES -- HANDLE_COMPONENTS -- VERSION_VAR TBB_VERSION) -- -- ################################## -- # Create targets -- ################################## -- -- if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND) -- add_library(tbb SHARED IMPORTED) -- set_target_properties(tbb PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS} -- IMPORTED_LOCATION ${TBB_LIBRARIES}) -- if(TBB_LIBRARIES_RELEASE AND TBB_LIBRARIES_DEBUG) -- set_target_properties(tbb PROPERTIES -- INTERFACE_COMPILE_DEFINITIONS "$<$,$>:TBB_USE_DEBUG=1>" -- IMPORTED_LOCATION_DEBUG ${TBB_LIBRARIES_DEBUG} -- IMPORTED_LOCATION_RELWITHDEBINFO ${TBB_LIBRARIES_DEBUG} -- IMPORTED_LOCATION_RELEASE ${TBB_LIBRARIES_RELEASE} -- IMPORTED_LOCATION_MINSIZEREL ${TBB_LIBRARIES_RELEASE} -- ) -- elseif(TBB_LIBRARIES_RELEASE) -- set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${TBB_LIBRARIES_RELEASE}) -- else() -- set_target_properties(tbb PROPERTIES -- INTERFACE_COMPILE_DEFINITIONS "${TBB_DEFINITIONS_DEBUG}" -- IMPORTED_LOCATION ${TBB_LIBRARIES_DEBUG} -- ) -- endif() -- endif() -- -- mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARIES) -- -- unset(TBB_ARCHITECTURE) -- unset(TBB_BUILD_TYPE) -- unset(TBB_LIB_PATH_SUFFIX) -- unset(TBB_DEFAULT_SEARCH_DIR) -- --endif() diff --git a/trng-external-catch.patch b/trng-external-catch.patch new file mode 100644 index 0000000..7784263 --- /dev/null +++ b/trng-external-catch.patch @@ -0,0 +1,25 @@ +Index: trng4-4.25/CMakeLists.txt +=================================================================== +--- trng4-4.25.orig/CMakeLists.txt ++++ trng4-4.25/CMakeLists.txt +@@ -14,6 +14,7 @@ endif() + + option(TRNG_ENABLE_TESTS "Enable/Disable the compilation of the TRNG tests" ON) + option(TRNG_ENABLE_EXAMPLES "Enable/Disable the compilation of the TRNG examples" ON) ++option(USE_EXTERNAL_CATCH "Use system installed Catch2" ON) + + if(CMAKE_CXX_COMPILER_ID MATCHES GNU) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wmaybe-uninitialized") +@@ -42,7 +43,11 @@ configure_package_config_file("cmake/Con + + add_subdirectory(trng) + if(TRNG_ENABLE_TESTS) +- add_subdirectory(external/Catch2) ++ if(USE_EXTERNAL_CATCH) ++ find_package(Catch2 2 REQUIRED) ++ else(USE_EXTERNAL_CATCH) ++ add_subdirectory(external/Catch2) ++ endif() + add_subdirectory(tests) + endif() + if(TRNG_ENABLE_EXAMPLES) diff --git a/trng.changes b/trng.changes index 220fc63..70567e5 100644 --- a/trng.changes +++ b/trng.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Oct 20 13:43:52 UTC 2023 - Atri Bhattacharya + +- Update to version 4.25: + * All unit tests have been converted to Catch2 unit test + framework. + * TRNG can be consumed as a third-party component in CMake-based + projects supporting CMake’s find_package. + * Support building static or shared libraries depending on the + BUILD_SHARED_LIBS CMake variable. + * Cuda support has been revised to work with Cuda 12.2. + * Experimental support for AMD’s Heterogeneous-compute Interface + for Portabilit (HIP). + * Several minor fixes and improvements. +- Add trng-external-catch.patch -- Allow using external Catch2 for + building and running tests (gh#rabauke/trng4#30). +- Drop trng-drop-findtbb-cmake-module.patch: fixed upstream. + ------------------------------------------------------------------- Sat Jan 15 14:11:18 UTC 2022 - Atri Bhattacharya diff --git a/trng.spec b/trng.spec index be3ef65..0a3b5ac 100644 --- a/trng.spec +++ b/trng.spec @@ -1,7 +1,7 @@ # # spec file for package trng # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,22 @@ # -%global shlib libtrng4-24 +%global shlib libtrng4-25 Name: trng -Version: 4.24 +Version: 4.25 Release: 0 Summary: A Random Number Generator Library License: BSD-3-Clause URL: https://www.numbercrunch.de/trng/ Source: https://github.com/rabauke/trng4/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM trng-drop-findtbb-cmake-module.patch gh#rabauke/trng4#26 badshah400@gmail.com -- Drop outdated FindTBB.cmake module and depend on TBB's bundled cmake module -Patch0: trng-drop-findtbb-cmake-module.patch +# PATCH-FIX-UPSTREAM trng-external-catch.patch gh#rabauke/trng4#30 badshah400@gmail.com -- Allow using external Catch2 for building and running tests +Patch0: trng-external-catch.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libboost_headers-devel BuildRequires: libboost_test-devel BuildRequires: tbb-devel +BuildRequires: cmake(Catch2) < 3.0 %description TRNG is a pseudo random number generator C++ library. @@ -69,11 +70,9 @@ applications against TRNG. %install %cmake_install -find %{buildroot}%{_libdir} -name *.a -delete -print %check -export LD_LIBRARY_PATH="%{buildroot}%{_libdir}" -./%{__builddir}/tests/test_all --no_color_output -l test_suite -r short +%ctest %post -n %{shlib} -p /sbin/ldconfig %postun -n %{shlib} -p /sbin/ldconfig @@ -86,6 +85,7 @@ export LD_LIBRARY_PATH="%{buildroot}%{_libdir}" %license COPYING %doc AUTHORS NEWS README.md doc/trng.pdf examples/ %{_libdir}/libtrng4.so +%{_libdir}/cmake/trng4/ %{_includedir}/trng/ %changelog