From 64f5fd719d7c0ee383d40fa5034e02feeaaffc9c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 6 Jun 2017 21:57:11 +0200 Subject: [PATCH] - added libdir patch (adjusts cmake install dir wrt. LIB_SUFFIX) - no need to disable asm on x32 now --- cryptopp-libdir.patch | 13 +++++++++++++ cryptopp.spec | 6 ++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 cryptopp-libdir.patch diff --git a/cryptopp-libdir.patch b/cryptopp-libdir.patch new file mode 100644 index 0000000..91b1c39 --- /dev/null +++ b/cryptopp-libdir.patch @@ -0,0 +1,13 @@ +--- cryptopp-5.6.4/CMakeLists.txt.orig 2016-09-11 09:07:48.000000000 +0200 ++++ cryptopp-5.6.4/CMakeLists.txt 2017-06-06 21:43:31.328699739 +0200 +@@ -306,8 +306,8 @@ + if(NOT CMAKE_VERSION VERSION_LESS 2.8.8) # CMakePackageConfigHelpers is supported from 2.8.8 + include(CMakePackageConfigHelpers) + write_basic_package_version_file("${PROJECT_BINARY_DIR}/cryptopp-config-version.cmake" VERSION ${cryptopp_VERSION_MAJOR}.${cryptopp_VERSION_MINOR}.${cryptopp_VERSION_PATCH} COMPATIBILITY SameMajorVersion) +- install(FILES cryptopp-config.cmake ${PROJECT_BINARY_DIR}/cryptopp-config-version.cmake DESTINATION "lib/cmake/cryptopp") +- install(EXPORT ${export_name} DESTINATION "lib/cmake/cryptopp") ++ install(FILES cryptopp-config.cmake ${PROJECT_BINARY_DIR}/cryptopp-config-version.cmake DESTINATION "lib${LIB_SUFFIX}/cmake/cryptopp") ++ install(EXPORT ${export_name} DESTINATION "lib${LIB_SUFFIX}/cmake/cryptopp") + endif() + + # Tests diff --git a/cryptopp.spec b/cryptopp.spec index 6e8e923..15876d1 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -3,10 +3,6 @@ %bcond_without asm # disable x86 assembly code %bcond_without tests # build without tests -%ifarch x32 -%undefine with_asm -%endif - %define orig_ver 564 Summary: Cryptopp Library - a free C++ class library of cryptographic schemes Summary(pl.UTF-8): Cryptopp - biblioteka klas C++ dostarczająca narzędzia do kryptografii @@ -18,6 +14,7 @@ Group: Libraries Source0: http://downloads.sourceforge.net/cryptopp/%{name}%{orig_ver}.zip # Source0-md5: 4ee7e5cdd4a45a14756c169eaf2a77fc Source1: %{name}.pc +Patch0: %{name}-libdir.patch URL: http://www.cryptopp.com/ BuildRequires: cmake >= 2.8.5 BuildRequires: libstdc++-devel @@ -58,6 +55,7 @@ Statyczna biblioteka Cryptopp. %prep %setup -q -c +%patch0 -p1 %build install -d build -- 2.44.0