From cb650b25b77613511a20e8c312451b84a4a4a9dd Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 18 Nov 2024 10:47:25 -0500 Subject: a litte bit more of experiments --- contrib/depends/builders/darwin.mk | 5 +++-- contrib/depends/packages/boost.mk | 13 +++++++------ contrib/depends/packages/wownero_seed.mk | 2 +- contrib/depends/packages/zeromq.mk | 1 + contrib/depends/patches/boost/fix_io_control_hpp.patch | 2 +- contrib/depends/patches/boost/static_iconv.patch | 13 +++++++++++++ contrib/depends/toolchain.cmake.in | 4 ++-- 7 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 contrib/depends/patches/boost/static_iconv.patch diff --git a/contrib/depends/builders/darwin.mk b/contrib/depends/builders/darwin.mk index 27f550a..bbc0475 100644 --- a/contrib/depends/builders/darwin.mk +++ b/contrib/depends/builders/darwin.mk @@ -10,8 +10,9 @@ build_darwin_SHA256SUM = shasum -a 256 build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o #darwin host on darwin builder. overrides darwin host preferences. -darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ + +darwin_CC=$(shell xcrun -f clang) -target $(CC_target) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --sdk macosx --show-sdk-path) -I$(shell xcrun --sdk macosx --show-sdk-path)/usr/include -I$(host_prefix)/include +darwin_CXX:=$(shell xcrun -f clang++) -target $(CC_target) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ --sysroot $(shell xcrun --sdk macosx --show-sdk-path) -I$(shell xcrun --sdk macosx --show-sdk-path)/usr/include -I$(host_prefix)/include darwin_AR:=$(shell xcrun -f ar) darwin_RANLIB:=$(shell xcrun -f ranlib) darwin_STRIP:=$(shell xcrun -f strip) diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index e5e45ff..ca429e7 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -1,10 +1,10 @@ package=boost -$(package)_version=1_84_0 -$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/1.84.0/ +$(package)_version=1_85_0 +$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/1.85.0/ $(package)_file_name=$(package)_$($(package)_version).tar.bz2 -$(package)_sha256_hash=cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 +$(package)_sha256_hash=7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617 $(package)_dependencies=libiconv -$(package)_patches=fix_io_control_hpp.patch +$(package)_patches=fix_io_control_hpp.patch static_iconv.patch define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -27,15 +27,16 @@ $(package)_cxxflags=-std=c++11 $(package)_cxxflags_linux=-fPIC $(package)_cxxflags_freebsd=-fPIC $(package)_cxxflags_android=-fPIC +$(package)_ldflags=-L$(host_prefix)/lib -L$(shell xcrun --sdk macosx --show-sdk-path)/usr/lib endef define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/fix_io_control_hpp.patch &&\ + patch -p1 < $($(package)_patch_dir)/static_iconv.patch &&\ echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam endef define $(package)_config_cmds - ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries) + ./bootstrap.sh --with-libraries=$(boost_config_libraries) endef define $(package)_build_cmds diff --git a/contrib/depends/packages/wownero_seed.mk b/contrib/depends/packages/wownero_seed.mk index b376f80..5335458 100644 --- a/contrib/depends/packages/wownero_seed.mk +++ b/contrib/depends/packages/wownero_seed.mk @@ -13,7 +13,7 @@ endef ifeq ($(host_os),darwin) define $(package)_config_cmds - CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_RANLIB="$($(package)_ranlib)" -DCMAKE_AR="$($(package)_ar)" -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON . + CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON . endef else define $(package)_config_cmds diff --git a/contrib/depends/packages/zeromq.mk b/contrib/depends/packages/zeromq.mk index 20f2d4b..7c41975 100644 --- a/contrib/depends/packages/zeromq.mk +++ b/contrib/depends/packages/zeromq.mk @@ -10,6 +10,7 @@ define $(package)_set_vars $(package)_config_opts_linux=--with-pic $(package)_config_opts_freebsd=--with-pic $(package)_cxxflags=-std=c++11 + $(package)_cxxflags_darwin=-std=c++11 -Wno-deprecated-declarations endef define $(package)_preprocess_cmds diff --git a/contrib/depends/patches/boost/fix_io_control_hpp.patch b/contrib/depends/patches/boost/fix_io_control_hpp.patch index 259a565..4d022f2 100644 --- a/contrib/depends/patches/boost/fix_io_control_hpp.patch +++ b/contrib/depends/patches/boost/fix_io_control_hpp.patch @@ -1,6 +1,6 @@ --- boost_1_84_0/boost/asio/detail/io_control.hpp.O 2017-04-17 03:22:26.000000000 +0100 +++ boost_1_84_0/boost/asio/detail/io_control.hpp 2019-11-15 15:46:16.957937137 +0000 -@@ -243,6 +243,9 @@ +@@ -11,6 +11,9 @@ # pragma once #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/contrib/depends/patches/boost/static_iconv.patch b/contrib/depends/patches/boost/static_iconv.patch new file mode 100644 index 0000000..57cf692 --- /dev/null +++ b/contrib/depends/patches/boost/static_iconv.patch @@ -0,0 +1,13 @@ +--- boost_1_84_0/libs/locale/build/Jamfile.v2.O 2017-04-17 03:22:26.000000000 +0100 ++++ boost_1_84_0/libs/locale/build/Jamfile.v2 2019-11-15 15:46:16.957937137 +0000 +@@ -11,6 +11,6 @@ + ICONV_PATH = [ modules.peek : ICONV_PATH ] ; + + # There may also be an external iconv library + lib iconv : +- : $(ICONV_PATH)/lib shared shared ++ : $(ICONV_PATH)/lib static static + : : $(ICONV_PATH)/include + ; + + explicit iconv ; diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 772c8a6..8d300bd 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -80,10 +80,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(CMAKE_OSX_ARCHITECTURES "x86_64") endif() SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/${CONF_TRIPLE}-) - SET(CMAKE_C_COMPILER @prefix@/native/bin/clang) + SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_C_COMPILER_TARGET ${CLANG_TARGET}) SET(CMAKE_C_FLAGS_INIT -B${_CMAKE_TOOLCHAIN_PREFIX}) - SET(CMAKE_CXX_COMPILER @prefix@/native/bin/clang++ -stdlib=libc++) + SET(CMAKE_CXX_COMPILER @CXX@) SET(CMAKE_CXX_COMPILER_TARGET ${CLANG_TARGET}) SET(CMAKE_CXX_FLAGS_INIT -B${_CMAKE_TOOLCHAIN_PREFIX}) SET(CMAKE_ASM_COMPILER_TARGET ${CLANG_TARGET}) -- cgit v1.2.3