diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-10-06 22:29:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-10-06 22:29:07 +0200 |
| commit | 2cf94c1321438eb66ffefca547b74f746d7c283a (patch) | |
| tree | 46beed54555b1eef53ff8f2039592a18c46357ef /external | |
| parent | need to link with -ldl on Linux when building statically (diff) | |
| download | monero-2cf94c1321438eb66ffefca547b74f746d7c283a.tar.xz | |
fix for mingw not playing nicely with libunbound configure, fix for correctly finding static libs on various operating systems
Diffstat (limited to 'external')
| -rwxr-xr-x | external/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | external/unbound/monero-config.sh | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 2b10442a4..3fb1cfce7 100755 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -101,11 +101,14 @@ IF(!UNBOUND_INCLUDE_DIR OR STATIC) IF(MINGW) set(ENV{USE_WINSOCK} 1) + set(ENV{CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + set(ENV{GCC_PREFIX} ${GCC_PREFIX}) + set(ENV{CMAKE_FIND_ROOT_PATH} ${CMAKE_FIND_ROOT_PATH}) EXTERNALPROJECT_ADD( libunbound PREFIX ${CMAKE_CURRENT_BINARY_DIR}/unbound URL ${CMAKE_CURRENT_SOURCE_DIR}/unbound/ - CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/unbound/configure --prefix=${CMAKE_FIND_ROOT_PATH} --build=${GCC_PREFIX} --host=${GCC_PREFIX} --disable-shared --enable-static --sysconfdir=${CMAKE_FIND_ROOT_PATH}/etc --localstatedir=${CMAKE_FIND_ROOT_PATH}/var --sbindir=${CMAKE_FIND_ROOT_PATH}/bin --disable-gost --disable-rpath --with-libevent=no --with-libexpat=${CMAKE_FIND_ROOT_PATH} --without-pyunbound --without-pythonmodule --with-ssl=${CMAKE_FIND_ROOT_PATH} --without-pthreads --with-libunbound-only + CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/unbound/monero-config.sh BUILD_COMMAND $(MAKE) UPDATE_COMMAND "" PATCH_COMMAND "" diff --git a/external/unbound/monero-config.sh b/external/unbound/monero-config.sh new file mode 100755 index 000000000..cfdc7e04b --- /dev/null +++ b/external/unbound/monero-config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +./configure --prefix=${CMAKE_FIND_ROOT_PATH} --build=${GCC_PREFIX} --host=${GCC_PREFIX} --disable-shared --enable-static --sysconfdir=${CMAKE_FIND_ROOT_PATH}/etc --localstatedir=${CMAKE_FIND_ROOT_PATH}/var --sbindir=${CMAKE_FIND_ROOT_PATH}/bin --disable-gost --disable-rpath --with-libevent=no --with-libexpat=${CMAKE_FIND_ROOT_PATH} --without-pyunbound --without-pythonmodule --with-ssl=${CMAKE_FIND_ROOT_PATH} --without-pthreads --with-libunbound-only |