Commit cd1cd5cb75

introduced an issue for CMAKE_BUILD_TYPE=Debug: libringct.so => not found libcryptonote_basic.so => not found libcheckpoints.so => not found libdevice.so => not found libringct_basic.so => not found libcommon.so => not found libwallet-crypto.so => not found libcncrypto.so => not found libeasylogging.so => not found librandomx.so => not found libversion.so => not found We'll only set `CMAKE_SKIP_RPATH` when in release.
4 years ago · 6e95b31a70
parent 346634ec09
commit 6e95b31a70
2 changed files with 38 additions and 47 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -11,10 +11,7 @@ set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

 option(FETCH_DEPS "Download dependencies if they are not found" ON)
 option(XMRTO "Include Xmr.To module" ON)
-option(MORPHTOKEN "Include MorphToken module" ON)
-option(XMRIG "Path to XMRig binary to embed inside Feather" OFF)
-option(TOR "Path to Tor binary to embed inside Feather" OFF)
-option(TOR_VERSION "Optional git hash or tag of embedded Tor version" "tor-0.4.3.5")
+option(BUILD_TOR "Build Tor" OFF)
 option(STATIC "Link libraries statically, requires static Qt")
 option(USE_DEVICE_TREZOR "Trezor support compilation" OFF)
 option(DONATE_BEG "Prompt donation window every once in a while" ON)
@ -31,7 +28,7 @@ if(DEBUG)
    set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()

-set(MONERO_HEAD "2fc0c6355d7f3756f9cc01f1165aeec42bc52201")
+set(MONERO_HEAD "a1404e92cb439ba0f120e7c4a579ed0b9a0372a4")
 set(BUILD_GUI_DEPS ON)
 set(ARCH "x86-64")
 set(BUILD_64 ON)
@ -161,7 +158,6 @@ find_package(Boost 1.58 REQUIRED COMPONENTS

 if(UNIX AND NOT APPLE)
    if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-        # https://github.com/monero-project/monero-gui/issues/3142#issuecomment-705940446
        set(CMAKE_SKIP_RPATH ON)
    endif()

@ -177,48 +173,47 @@ if(UNIX AND NOT APPLE)
    endif()
 endif()

-if("$ENV{DRONE}" STREQUAL "true")
-    message(STATUS "We are inside a static compile with Drone CI")
-endif()
+# Tor/torsocks
+set(TOR_TAG "tor-0.4.3.5")
+set(TOR_DIR "${CMAKE_SOURCE_DIR}/contrib/tor")

-# To build Feather with embedded (and static) Tor, pass CMake -DTOR=/path/to/tor
-if(TOR)
-    if(APPLE)
-        execute_process(COMMAND bash -c "touch ${CMAKE_CURRENT_SOURCE_DIR}/src/tor/libevent-2.1.7.dylib")
-    endif()
-
-    # on the buildbot Tor is baked into the image
-    # - linux: See `Dockerfile`
-    # - windows: https://github.com/mxe/mxe/blob/1024dc7d2db5eb7d5d3c64a2c12b5f592572f1ce/plugins/apps/tor.mk
-    # - macos: taken from Tor Browser official release
-    set(TOR_COPY_CMD "cp ${TOR} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
-    message(STATUS "${TOR_COPY_CMD}")
-    execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret)
-    if(ret EQUAL "1")
-        message(FATAL_ERROR "Tor copy failure: ${TOR_COPY_CMD}")
-    endif()
+if(BUILD_TOR AND APPLE)
+    execute_process(COMMAND bash -c "touch ${CMAKE_SOURCE_DIR}/src/tor/libevent-2.1.7.dylib")
+ENDIF()

-    message(STATUS "Embedding Tor binary at ${TOR}")
-else()
-    message(STATUS "Skipping Tor inclusion because -DTOR=Off")
+if(UNIX AND NOT APPLE)
+    set(TOR_LIB "libtorsocks.so")
+elseif(APPLE)
+    set(TOR_LIB "libtorsocks.dylib")
 endif()

-# To build Feather with embedded (and static) XMRig, pass CMake -DXMRIG=/path/to/xmrig
-if(XMRIG)
-    # on the buildbot XMRig is baked into the image
-    # - linux: See `Dockerfile`
-    # - windows: See `Dockerfile_windows`
-    # - macos: manually downloaded an official release
-    set(XMRIG_COPY_CMD "cp ${XMRIG} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/xmrig")
-    message(STATUS "${XMRIG_COPY_CMD}")
-    execute_process(COMMAND bash -c "${XMRIG_COPY_CMD}" RESULT_VARIABLE ret)
-    if(ret EQUAL "1")
-        message(FATAL_ERROR "XMRig copy failure: ${XMRIG_COPY_CMD}")
+if("$ENV{DRONE}" STREQUAL "true" AND APPLE)
+    message(STATUS "We are inside a static compile with Drone CI")
+    # @TODO: taken from Tor Browser official release for now
+    execute_process(COMMAND bash -c "cp ~/tor/libevent-2.1.7.dylib ${CMAKE_SOURCE_DIR}/src/tor/libevent-2.1.7.dylib")
+    execute_process(COMMAND bash -c "cp ~/tor/tor ${CMAKE_SOURCE_DIR}/src/tor/tor")
+elseif("$ENV{DRONE}" STREQUAL "true" AND BUILD_TOR)
+    message(STATUS "We are inside a static compile with Drone CI")
+    if(MINGW)
+        execute_process(COMMAND bash -c "cp /mxe/usr/x86_64-w64-mingw32.static/bin/tor.exe ${CMAKE_SOURCE_DIR}/src/tor/tor.exe")
+    elseif(UNIX AND NOT APPLE)
+        execute_process(COMMAND bash -c "cp /usr/local/tor/bin/tor ${CMAKE_SOURCE_DIR}/src/tor/tor")
+        execute_process(COMMAND bash -c "cp /usr/local/torsocks/lib/torsocks/* ${CMAKE_SOURCE_DIR}/src/tor/")
    endif()
-
-    message(STATUS "Embedding XMRig binary at ${XMRIG}")
 else()
-    message(STATUS "Skipping XMRig inclusion because -DXMRIG=Off")
+    if(BUILD_TOR)
+        if(UNIX OR APPLE)
+            execute_process(COMMAND bash -c "ls -al src/tor/${TOR_LIB} 2>/dev/null" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE TOR_FOUND OUTPUT_STRIP_TRAILING_WHITESPACE)
+            if(TOR_FOUND)
+                message(STATUS "${TOR_LIB} found, skipping Tor build")
+            else()
+                message(STATUS "${TOR_LIB} not found, building Tor")
+                execute_process(COMMAND bash -c "bash build_tor.sh ${TOR_TAG} ${CMAKE_SOURCE_DIR} 'ON'" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/contrib)
+            endif()
+        endif()
+    else()
+        message(STATUS "Skipping Tor build because -DBUILD_TOR=OFF")
+    endif()
 endif()

 if(MINGW)
@ -366,8 +361,4 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")

-if(APPLE)
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/contrib/KDMacTouchBar")
-endif()
-
 add_subdirectory(src)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2fc0c6355d7f3756f9cc01f1165aeec42bc52201
+Subproject commit 3cbb44a2fd79ce9c667006e2e42e61513993e59a