diff options
author | luigi1111 <luigi1111w@gmail.com> | 2024-03-07 21:24:30 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2024-03-07 21:24:30 -0500 |
commit | 4582656f60694433f6cc3a1582a5135ae09f30e3 (patch) | |
tree | 4d6864466dcda725e96d00325bbc34fe05146a5a | |
parent | Merge pull request #9168 (diff) | |
parent | depends: remove unwind (diff) | |
download | monero-4582656f60694433f6cc3a1582a5135ae09f30e3.tar.xz |
Merge pull request #9169
119e341 depends: remove unwind (tobtoht)
-rw-r--r-- | contrib/depends/packages/unwind.mk | 29 | ||||
-rw-r--r-- | contrib/depends/patches/unwind/fix_obj_order.patch | 11 |
2 files changed, 0 insertions, 40 deletions
diff --git a/contrib/depends/packages/unwind.mk b/contrib/depends/packages/unwind.mk deleted file mode 100644 index c3d190bca..000000000 --- a/contrib/depends/packages/unwind.mk +++ /dev/null @@ -1,29 +0,0 @@ -package=unwind -$(package)_version=1.5.0 -$(package)_download_path=https://download.savannah.nongnu.org/releases/libunwind -$(package)_file_name=lib$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 -$(package)_patches=fix_obj_order.patch - -define $(package)_preprocess_cmds - patch -p0 < $($(package)_patch_dir)/fix_obj_order.patch -endef - -define $(package)_config_cmds - cp -f $(BASEDIR)/config.guess config/config.guess &&\ - cp -f $(BASEDIR)/config.sub config/config.sub &&\ - $($(package)_autoconf) --disable-shared --enable-static --disable-tests --disable-documentation 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/patches/unwind/fix_obj_order.patch b/contrib/depends/patches/unwind/fix_obj_order.patch deleted file mode 100644 index e764f0f3d..000000000 --- a/contrib/depends/patches/unwind/fix_obj_order.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- config/ltmain.sh.0 2020-11-10 17:25:26.000000000 +0100 -+++ config/ltmain.sh 2021-09-11 19:39:36.000000000 +0200 -@@ -10768,6 +10768,8 @@ - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result -+ oldobjs=`for obj in $oldobjs; do echo $obj; done | sort` -+ oldobjs=" `echo $oldobjs`" - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" |