Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -462,12 +462,6 @@ find_library(TOR_LIBRARY
# Find OpenSSL library
find_package(OpenSSL 1.1.1 REQUIRED)

# Find MiniUPNP library
find_library(MINIUPNP_LIBRARY
NAMES miniupnpc
REQUIRED
)

# Find GMP library
find_package(GMP 6.2.1 REQUIRED)

Expand Down
4 changes: 2 additions & 2 deletions depends/hosts/darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ LD64_VERSION=609

OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers

darwin_native_binutils=native_cctools
darwin_native_binutils=

ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
# FORCE_USE_SYSTEM_CLANG is empty, so we use our depends-managed, pinned clang
# from llvm.org

# Clang is a dependency of native_cctools when FORCE_USE_SYSTEM_CLANG is empty
darwin_native_toolchain=native_cctools
darwin_native_toolchain=

clang_prog=$(build_prefix)/bin/clang
clangxx_prog=$(clang_prog)++
Expand Down
5 changes: 3 additions & 2 deletions depends/packages/bls-dash.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $(package)_download_file=$($(package)_version).tar.gz
$(package)_file_name=$(package)-$($(package)_download_file)
$(package)_build_subdir=build
$(package)_sha256_hash=276c8573104e5f18bb5b9fd3ffd49585dda5ba5f6de2de74759dda8ca5a9deac
$(package)_dependencies=gmp native_cmake
$(package)_dependencies=gmp

$(package)_relic_version=3a23142be0a5510a3aa93cd6c76fc59d3fc732a5
$(package)_relic_download_path=https://github.com/relic-toolkit/relic/archive
Expand Down Expand Up @@ -34,6 +34,7 @@ endef

define $(package)_set_vars
$(package)_config_opts=-DCMAKE_INSTALL_PREFIX=$($(package)_staging_dir)/$(host_prefix)
$(package)_config_opts+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
$(package)_config_opts+= -DCMAKE_PREFIX_PATH=$(host_prefix)
$(package)_config_opts+= -DSTLIB=ON -DSHLIB=OFF -DSTBIN=ON
$(package)_config_opts+= -DBUILD_BLS_PYTHON_BINDINGS=0 -DBUILD_BLS_TESTS=0 -DBUILD_BLS_BENCHMARKS=0
Expand Down Expand Up @@ -66,7 +67,7 @@ define $(package)_config_cmds
export CFLAGS="$($(package)_cflags) $($(package)_cppflags)" && \
export CXXFLAGS="$($(package)_cxxflags) $($(package)_cppflags)" && \
export LDFLAGS="$($(package)_ldflags)" && \
$(build_prefix)/bin/cmake ../ $($(package)_config_opts)
cmake ../ $($(package)_config_opts)
endef

define $(package)_build_cmds
Expand Down
23 changes: 0 additions & 23 deletions depends/packages/dbus.mk

This file was deleted.

23 changes: 0 additions & 23 deletions depends/packages/libICE.mk

This file was deleted.

23 changes: 0 additions & 23 deletions depends/packages/libSM.mk

This file was deleted.

23 changes: 0 additions & 23 deletions depends/packages/libX11.mk

This file was deleted.

22 changes: 0 additions & 22 deletions depends/packages/libXext.mk

This file was deleted.

28 changes: 0 additions & 28 deletions depends/packages/miniupnpc.mk

This file was deleted.

7 changes: 1 addition & 6 deletions depends/packages/native_b2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@ $(package)_download_path=$(boost_download_path)
$(package)_file_name=$(boost_file_name)
$(package)_sha256_hash=$(boost_sha256_hash)
$(package)_build_subdir=tools/build/src/engine
ifneq (,$(findstring clang,$($(package)_cxx)))
$(package)_toolset_$(host_os)=clang
else
$(package)_toolset_$(host_os)=gcc
endif

define $(package)_build_cmds
CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" ./build.sh "$($(package)_toolset_$(host_os))"
CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" ./build.sh
endef

define $(package)_stage_cmds
Expand Down
25 changes: 0 additions & 25 deletions depends/packages/native_ccache.mk

This file was deleted.

37 changes: 0 additions & 37 deletions depends/packages/native_cctools.mk

This file was deleted.

32 changes: 0 additions & 32 deletions depends/packages/native_clang.mk

This file was deleted.

21 changes: 0 additions & 21 deletions depends/packages/native_cmake.mk

This file was deleted.

15 changes: 0 additions & 15 deletions depends/packages/native_ds_store.mk

This file was deleted.

25 changes: 0 additions & 25 deletions depends/packages/native_libdmg-hfsplus.mk

This file was deleted.

Loading
Loading