diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2024-11-19 05:54:32 -0500 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2024-11-19 05:54:32 -0500 |
| commit | d18a8137d591844880a1532c7d85e68f47bd217f (patch) | |
| tree | af3f428a7fad860601ba1dd755e395546f4e8fd4 | |
| parent | a0fd39918e154177503b1e5acfd4968727c814ae (diff) | |
update definitions
| -rw-r--r-- | contrib/depends/packages/boost.mk | 3 | ||||
| -rw-r--r-- | contrib/depends/packages/libiconv.mk | 1 | ||||
| -rw-r--r-- | contrib/depends/patches/boost/static_iconv.patch | 13 |
3 files changed, 1 insertions, 16 deletions
diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index ca429e7..6077a92 100644 --- 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 index efb2bea..b2f23eb 100644 --- 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 deleted file mode 100644 index 57cf692..0000000 --- a/contrib/depends/patches/boost/static_iconv.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 : -- : <search>$(ICONV_PATH)/lib <link>shared <runtime-link>shared -+ : <search>$(ICONV_PATH)/lib <link>static <runtime-link>static - : : <include>$(ICONV_PATH)/include - ; - - explicit iconv ; |