diff options
| -rw-r--r-- | dev-libs/randomx/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/randomx/files/1.1.6-build-mark-src-randomx.h-as-a-public-header.patch | 23 | ||||
| -rw-r--r-- | dev-libs/randomx/files/1.1.6-build-remove-hardcoded-lib-destination.patch | 28 | ||||
| -rw-r--r-- | dev-libs/randomx/randomx-1.1.7.ebuild (renamed from dev-libs/randomx/randomx-1.1.6.ebuild) | 7 |
4 files changed, 2 insertions, 58 deletions
diff --git a/dev-libs/randomx/Manifest b/dev-libs/randomx/Manifest index 0360b35b..5d313a54 100644 --- a/dev-libs/randomx/Manifest +++ b/dev-libs/randomx/Manifest @@ -1 +1 @@ -DIST randomx-1.1.6.tar.gz 1708251 BLAKE2B 55fc6d726eae9bdcb897ea02a277d11a7e29974f90db8af20a173fca2c7ab543d365c3a4599965282b909ba999c128a5d488099cc633d4a66574d92dc8aa519f SHA512 c59ebccd5ddc7690824b8fc68c4492f1a00d785e5820a69a73361ae639d66d2a6d1589e8b9783666edf29374516e4e1ca3a887393bab8b98bd0086e4783ac3c8 +DIST randomx-1.1.7.tar.gz 162740 BLAKE2B 6aa5d710e2d2dc8b74b457aec7bf6e0cc70eec6b7b41ae1d644ae5c4fcff032292f03be123f64ba92383acecc82124a3ebcabb2fdcb021b24ff06e778936085d SHA512 5987ebb26750b30cffcf8b345c94ee38f49b69f3fbc7f5b3fdd32e98c704ce2bf16a2dace523bfe2b6e9a46d4faa3c6f3317c6b435f0515aa518c920dce061be diff --git a/dev-libs/randomx/files/1.1.6-build-mark-src-randomx.h-as-a-public-header.patch b/dev-libs/randomx/files/1.1.6-build-mark-src-randomx.h-as-a-public-header.patch deleted file mode 100644 index 0b4e9d35..00000000 --- a/dev-libs/randomx/files/1.1.6-build-mark-src-randomx.h-as-a-public-header.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c1f958cb35904540c8c1a19dd8c9d7bb7004eca9 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Wed, 6 Nov 2019 01:59:07 +0000 -Subject: [PATCH 2/2] build: mark src/randomx.h as a public header - -this allow src/randomx.h to be installed in /usr/include/randomx.h -automagically during make install ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b54a5ba613c..85da159bd23c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -157,6 +157,7 @@ add_library(randomx - set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET randomx PROPERTY CXX_STANDARD 11) - set_property(TARGET randomx PROPERTY CXX_STANDARD_REQUIRED ON) -+set_property(TARGET randomx PROPERTY PUBLIC_HEADER src/randomx.h) - install(TARGETS randomx - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-libs/randomx/files/1.1.6-build-remove-hardcoded-lib-destination.patch b/dev-libs/randomx/files/1.1.6-build-remove-hardcoded-lib-destination.patch deleted file mode 100644 index f036c8d6..00000000 --- a/dev-libs/randomx/files/1.1.6-build-remove-hardcoded-lib-destination.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a1d310c36ce8254cc7d24524fe3307f2c5394445 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Wed, 6 Nov 2019 01:44:05 +0000 -Subject: [PATCH 1/2] build: remove hardcoded lib/ destination - -cmake internally has a logic to know where is the best place to install -a given library. For example on amd64 it does not make sense to install -the library in /usr/lib, this change allow the library to the installed -in /usr/lib64 ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40f03541ed0d..4b54a5ba613c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -158,8 +158,8 @@ set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET randomx PROPERTY CXX_STANDARD 11) - set_property(TARGET randomx PROPERTY CXX_STANDARD_REQUIRED ON) - install(TARGETS randomx -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - add_executable(randomx-tests - src/tests/tests.cpp) diff --git a/dev-libs/randomx/randomx-1.1.6.ebuild b/dev-libs/randomx/randomx-1.1.7.ebuild index b6644bf8..aa119054 100644 --- a/dev-libs/randomx/randomx-1.1.6.ebuild +++ b/dev-libs/randomx/randomx-1.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,11 +21,6 @@ S="${WORKDIR}/RandomX-${PV}" CMAKE_BUILD_TYPE=Release -PATCHES=( - "${FILESDIR}/${PV}-build-remove-hardcoded-lib-destination.patch" - "${FILESDIR}/${PV}-build-mark-src-randomx.h-as-a-public-header.patch" -) - src_configure() { local mycmakeargs=( -DARCH=native |