From: tobtoht Date: Sun, 29 Sep 2024 13:11:20 +0000 (+0200) Subject: build: remove libiconv X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=17a7ac26d3ff4253162167d0a42a8db3c227a60b;p=gamesguru%2Ffeather.git build: remove libiconv --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 429afb2d..86538c77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,16 +138,18 @@ if(MINGW) endif() set(BOOST_COMPONENTS - system - filesystem - thread - date_time chrono + date_time + filesystem + program_options regex serialization - program_options - locale + system + thread ) +if (WIN32) + list(APPEND BOOST_COMPONENTS locale) +endif() if(STACK_TRACE AND UNIX AND NOT APPLE) list(APPEND BOOST_COMPONENTS diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index 83d3b437..5e08c309 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -3,7 +3,6 @@ $(package)_version=1.85.0 $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/ $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.gz $(package)_sha256_hash=be0d91732d5b0cc6fbb275c7939974457e79b54d6f07ce2e3dfdd68bef883b0b -$(package)_dependencies=libiconv $(package)_patches=disable_addr2line.patch define $(package)_set_vars @@ -21,7 +20,8 @@ $(package)_toolset_$(host_os)=gcc $(package)_archiver_$(host_os)=$($(package)_ar) $(package)_toolset_darwin=darwin $(package)_archiver_darwin=$($(package)_libtool) -$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale,stacktrace +$(package)_config_libraries_$(host_os)="chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,stacktrace" +$(package)_config_libraries_mingw32="chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,stacktrace,locale" $(package)_cxxflags=-std=c++17 $(package)_cxxflags_linux=-fPIC $(package)_cxxflags_freebsd=-fPIC @@ -33,7 +33,7 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries) + ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries_$(host_os)) endef define $(package)_build_cmds diff --git a/contrib/depends/packages/libiconv.mk b/contrib/depends/packages/libiconv.mk deleted file mode 100644 index de6c5771..00000000 --- a/contrib/depends/packages/libiconv.mk +++ /dev/null @@ -1,29 +0,0 @@ -package=libiconv -$(package)_version=1.17 -$(package)_download_path=https://ftp.gnu.org/gnu/libiconv -$(package)_file_name=libiconv-$($(package)_version).tar.gz -$(package)_sha256_hash=8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 - -define $(package)_set_vars - $(package)_config_opts=--disable-nls - $(package)_config_opts=--enable-static - $(package)_config_opts=--disable-shared - $(package)_config_opts_linux=--with-pic - $(package)_config_opts_freebsd=--with-pic -endef - -define $(package)_config_cmds - $($(package)_autoconf) AR_FLAGS=$($(package)_arflags) -endef - -define $(package)_build_cmds - $(MAKE) -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef - -define $(package)_postprocess_cmds - rm lib/*.la -endef diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index ee52ff3d..174a3b91 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,4 +1,4 @@ -packages := boost openssl libiconv unbound qrencode libsodium polyseed hidapi abseil protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp +packages := boost openssl unbound qrencode libsodium polyseed hidapi abseil protobuf libusb zlib libgpg-error libgcrypt expat libzip zxing-cpp native_packages := native_qt native_abseil native_protobuf linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime diff --git a/contrib/depends/patches/libiconv/fix-whitespace.patch b/contrib/depends/patches/libiconv/fix-whitespace.patch deleted file mode 100644 index 531364b4..00000000 --- a/contrib/depends/patches/libiconv/fix-whitespace.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/preload/configure b/preload/configure -index aab5c77..e20b8f0 100755 ---- a/preload/configure -+++ b/preload/configure -@@ -588,7 +588,7 @@ MAKEFLAGS= - PACKAGE_NAME='libiconv' - PACKAGE_TARNAME='libiconv' - PACKAGE_VERSION='0' --PACKAGE_STRING='libiconv 0' -+PACKAGE_STRING='libiconv0' - PACKAGE_BUGREPORT='' - PACKAGE_URL='' - diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index da73d476..b7e6f7e8 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -56,8 +56,6 @@ endif() endif() -set(ICONV_LIBRARIES @prefix@/lib/libiconv.a) - SET(ZMQ_INCLUDE_PATH @prefix@/include) SET(ZMQ_LIB @prefix@/lib/libzmq.a) diff --git a/monero b/monero index e39e3e68..14d2ac09 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit e39e3e68ba432846199634baca9c2d3ad0d926cd +Subproject commit 14d2ac095df656745e383258f4434ed4968b1c6b diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e4535081..42253b30 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -288,10 +288,6 @@ if(CHECK_UPDATES) target_link_libraries(feather PRIVATE openpgp) endif() -if(DEPENDS) - target_link_libraries(feather PRIVATE ${ICONV_LIBRARIES}) -endif() - if(DEVICE_TREZOR_READY) find_package(Protobuf CONFIG) if (NOT Protobuf_FOUND) diff --git a/src/polyseed/polyseed.cpp b/src/polyseed/polyseed.cpp index e0e4ad46..0f27d844 100644 --- a/src/polyseed/polyseed.cpp +++ b/src/polyseed/polyseed.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include @@ -15,8 +14,6 @@ namespace polyseed { - static std::locale locale; - static size_t utf8_nfc(const char* str, polyseed_str norm) { auto Qstr = QString(str); auto Qs = Qstr.normalized(QString::NormalizationForm_C); @@ -63,10 +60,6 @@ namespace polyseed { throw std::runtime_error("sodium_init failed"); } - boost::locale::generator gen; - gen.locale_cache_enabled(true); - locale = gen(""); - sodium_memzero(seed, POLYSEED_RANDBYTES); polyseed_dependency pd;