Merge pull request #133274 from applePrincess/fix-ethminer
ethminer: fix global-context
This commit is contained in:
commit
84caf07de4
25
pkgs/tools/misc/ethminer/add-global-context.patch
Normal file
25
pkgs/tools/misc/ethminer/add-global-context.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt
|
||||||
|
index 1a53de8..832e926 100644
|
||||||
|
--- a/libethcore/CMakeLists.txt
|
||||||
|
+++ b/libethcore/CMakeLists.txt
|
||||||
|
@@ -7,7 +7,7 @@ set(SOURCES
|
||||||
|
include_directories(BEFORE ..)
|
||||||
|
|
||||||
|
add_library(ethcore ${SOURCES})
|
||||||
|
-target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon)
|
||||||
|
+target_link_libraries(ethcore PUBLIC devcore ethash::ethash ethash-global-context PRIVATE hwmon)
|
||||||
|
|
||||||
|
if(ETHASHCL)
|
||||||
|
target_link_libraries(ethcore PRIVATE ethash-cl)
|
||||||
|
diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h
|
||||||
|
index d9aadc7..fe5c6cf 100644
|
||||||
|
--- a/libethcore/EthashAux.h
|
||||||
|
+++ b/libethcore/EthashAux.h
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <libdevcore/Worker.h>
|
||||||
|
|
||||||
|
#include <ethash/ethash.hpp>
|
||||||
|
+#include <ethash/global_context.hpp>
|
||||||
|
|
||||||
|
namespace dev
|
||||||
|
{
|
@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
|
|||||||
cudatoolkit
|
cudatoolkit
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# global context library is separated from libethash
|
||||||
|
./add-global-context.patch
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
|
sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user