diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-09-23 22:19:50 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-09-23 22:19:50 -0500 |
| commit | 415e29067534cb97282ba1cbeed3cc2ff347d13f (patch) | |
| tree | 83d9bdd2be9bc1d4a4e7747cc018ddf102451481 /contrib | |
| parent | Merge pull request #7930 (diff) | |
| parent | depends: update unwind, fix build with ubuntu 21.04 (diff) | |
| download | monero-415e29067534cb97282ba1cbeed3cc2ff347d13f.tar.xz | |
Merge pull request #7933
43a7279 depends: update unwind, fix build with ubuntu 21.04 (selsta)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/packages/unwind.mk | 6 | ||||
| -rw-r--r-- | contrib/depends/patches/unwind/fix_obj_order.patch | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/depends/packages/unwind.mk b/contrib/depends/packages/unwind.mk index 826a820c4..c3d190bca 100644 --- a/contrib/depends/packages/unwind.mk +++ b/contrib/depends/packages/unwind.mk @@ -1,8 +1,8 @@ package=unwind -$(package)_version=1.2 +$(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=1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992 +$(package)_sha256_hash=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 $(package)_patches=fix_obj_order.patch define $(package)_preprocess_cmds @@ -12,7 +12,7 @@ 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 AR_FLAGS=$($(package)_arflags) + $($(package)_autoconf) --disable-shared --enable-static --disable-tests --disable-documentation AR_FLAGS=$($(package)_arflags) endef define $(package)_build_cmds diff --git a/contrib/depends/patches/unwind/fix_obj_order.patch b/contrib/depends/patches/unwind/fix_obj_order.patch index 374a9f04a..e764f0f3d 100644 --- a/contrib/depends/patches/unwind/fix_obj_order.patch +++ b/contrib/depends/patches/unwind/fix_obj_order.patch @@ -1,9 +1,9 @@ ---- config/ltmain.sh.O 2017-01-13 16:00:54.000000000 +0000 -+++ config/ltmain.sh 2019-11-17 06:46:51.994402494 +0000 -@@ -7957,6 +7957,8 @@ - esac - done +--- 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\" |