pool/trng
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 946786 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/946786
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trng?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2022-01-16 22:18:31 +00:00 committed by Git OBS Bridge
commit 44fb246a78
3 changed files with 320 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

308
trng-drop-findtbb-cmake-module.patch Normal file
View File

@ -0,0 +1,308 @@
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>_LIBRARY - The path of the TBB the corresponding TBB library.
-# These libraries, if specified, override the
-# corresponding library search results, where <library>
-# 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_<component>_FOUND - If False, optional <component> 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>_LIBRARY_RELEASE - The path of the TBB release version of
-# <library>, where <library> may be tbb, tbb_debug,
-# tbbmalloc, tbbmalloc_debug, tbb_preview, or
-# tbb_preview_debug.
-# * TBB_<library>_LIBRARY_DEGUG - The path of the TBB release version of
-# <library>, where <library> 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 <arch>/gcc4.1 or
- # <arch>/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 "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>: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()

8
trng.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jan 15 14:11:18 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
- Add trng-drop-findtbb-cmake-module.patch: Drop outdated
FindTBB.cmake module and depend on TBB's bundled cmake module
[gh#rabauke/trng4#26].
- Enable builds for aarch64: Tests fixed.
-------------------------------------------------------------------
Thu Apr 1 00:13:59 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>

8
trng.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package trng
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,13 +24,13 @@ 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
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libboost_headers-devel
BuildRequires: libboost_test-devel
BuildRequires: tbb-devel
# Tests fail on aarch64, see https://github.com/rabauke/trng4/issues/21
ExcludeArch: aarch64
%description
TRNG is a pseudo random number generator C++ library.
@ -61,7 +61,7 @@ This package provides the headers and devel files for developing
applications against TRNG.
%prep
%autosetup -n %{name}4-%{version}
%autosetup -p1 -n %{name}4-%{version}
%build
%cmake