fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better scripts/build.*.sh compatibility.

Browse source
This commit is contained in:
XMRig 2020-08-23 15:46:56 +07:00
parent 879e160ba3
commit 4b682b6633
No known key found for this signature in database
GPG key ID: 446A53638BE94409
8 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmake/flags.cmake
View file

@ -96,6 +96,10 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
endif() endif()
endif() endif()
if (BUILD_STATIC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
endif()
endif() endif()
if (NOT WIN32) if (NOT WIN32)

4
scripts/build.hwloc.sh
View file

@ -13,7 +13,7 @@ tar -xzf hwloc-${HWLOC_VERSION}.tar.gz
cd hwloc-${HWLOC_VERSION} cd hwloc-${HWLOC_VERSION}
./configure --disable-shared --enable-static --disable-io --disable-libudev --disable-libxml2 ./configure --disable-shared --enable-static --disable-io --disable-libudev --disable-libxml2
make -j$(nproc) make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
cp -fr include/ ../../deps cp -fr include ../../deps
cp hwloc/.libs/libhwloc.a ../../deps/lib cp hwloc/.libs/libhwloc.a ../../deps/lib
cd .. cd ..

19
scripts/build.hwloc1.sh Executable file
View file

@ -0,0 +1,19 @@
#!/bin/bash -e
HWLOC_VERSION="1.11.13"
mkdir -p deps
mkdir -p deps/include
mkdir -p deps/lib
mkdir -p build && cd build
wget https://download.open-mpi.org/release/hwloc/v1.11/hwloc-${HWLOC_VERSION}.tar.gz -O hwloc-${HWLOC_VERSION}.tar.gz
tar -xzf hwloc-${HWLOC_VERSION}.tar.gz
cd hwloc-${HWLOC_VERSION}
./configure --disable-shared --enable-static --disable-io --disable-libudev --disable-libxml2
make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
cp -fr include ../../deps
cp src/.libs/libhwloc.a ../../deps/lib
cd ..

4
scripts/build.libressl.sh
View file

@ -13,8 +13,8 @@ tar -xzf libressl-${LIBRESSL_VERSION}.tar.gz
cd libressl-${LIBRESSL_VERSION} cd libressl-${LIBRESSL_VERSION}
./configure --disable-shared ./configure --disable-shared
make -j$(nproc) make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
cp -fr include/ ../../deps cp -fr include ../../deps
cp crypto/.libs/libcrypto.a ../../deps/lib cp crypto/.libs/libcrypto.a ../../deps/lib
cp ssl/.libs/libssl.a ../../deps/lib cp ssl/.libs/libssl.a ../../deps/lib
cd .. cd ..

4
scripts/build.openssl.sh
View file

@ -13,8 +13,8 @@ tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
cd openssl-${OPENSSL_VERSION} cd openssl-${OPENSSL_VERSION}
./config -no-shared -no-asm -no-zlib -no-comp -no-dgram -no-filenames -no-cms ./config -no-shared -no-asm -no-zlib -no-comp -no-dgram -no-filenames -no-cms
make -j$(nproc) make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
cp -fr include/ ../../deps cp -fr include ../../deps
cp libcrypto.a ../../deps/lib cp libcrypto.a ../../deps/lib
cp libssl.a ../../deps/lib cp libssl.a ../../deps/lib
cd .. cd ..

4
scripts/build.uv.sh
View file

@ -14,7 +14,7 @@ tar -xzf v${UV_VERSION}.tar.gz
cd libuv-${UV_VERSION} cd libuv-${UV_VERSION}
sh autogen.sh sh autogen.sh
./configure --disable-shared ./configure --disable-shared
make -j$(nproc) make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
cp -fr include/ ../../deps cp -fr include ../../deps
cp .libs/libuv.a ../../deps/lib cp .libs/libuv.a ../../deps/lib
cd .. cd ..

2
src/backend/cuda/cuda.cmake
View file

@ -1,4 +1,4 @@
if (BUILD_STATIC AND XMRIG_OS_LINUX AND WITH_CUDA) if (BUILD_STATIC AND XMRIG_OS_UNIX AND WITH_CUDA)
message(WARNING "CUDA backend is not compatible with static build, use -DWITH_CUDA=OFF to suppress this warning") message(WARNING "CUDA backend is not compatible with static build, use -DWITH_CUDA=OFF to suppress this warning")
set(WITH_CUDA OFF) set(WITH_CUDA OFF)

2
src/backend/opencl/opencl.cmake
View file

@ -1,4 +1,4 @@
if (BUILD_STATIC AND XMRIG_OS_LINUX AND WITH_OPENCL) if (BUILD_STATIC AND XMRIG_OS_UNIX AND WITH_OPENCL)
message(WARNING "OpenCL backend is not compatible with static build, use -DWITH_OPENCL=OFF to suppress this warning") message(WARNING "OpenCL backend is not compatible with static build, use -DWITH_OPENCL=OFF to suppress this warning")
set(WITH_OPENCL OFF) set(WITH_OPENCL OFF)