update definitions

MrCyjaneK · Nov 19, 2024 · d18a813 · d18a813
1 parent a0fd399
commit d18a813
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk
@@ -4,7 +4,7 @@ $(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/1
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
 $(package)_sha256_hash=7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
 $(package)_dependencies=libiconv
-$(package)_patches=fix_io_control_hpp.patch static_iconv.patch
+$(package)_patches=fix_io_control_hpp.patch
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
@@ -31,7 +31,6 @@ $(package)_ldflags=-L$(host_prefix)/lib -L$(shell xcrun --sdk macosx --show-sdk-
 endef
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/static_iconv.patch &&\
   echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 

diff --git a/contrib/depends/packages/libiconv.mk b/contrib/depends/packages/libiconv.mk
@@ -7,7 +7,6 @@ $(package)_sha256_hash=8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65
 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

diff --git a/contrib/depends/patches/boost/static_iconv.patch b/contrib/depends/patches/boost/static_iconv.patch