diff options
| author | Howard Chu <hyc@symas.com> | 2019-11-16 16:13:06 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2019-11-17 13:45:47 +0000 |
| commit | 6bb94b1c3003e06d164e4e43785bf132b33d5cda (patch) | |
| tree | b589dcb0292dcf5499464866a4dbab478d99690e | |
| parent | Fixup sodium darwin (diff) | |
| download | monero-6bb94b1c3003e06d164e4e43785bf132b33d5cda.tar.xz | |
Fix unwind library ordering
Sort objects being archived
| -rw-r--r-- | contrib/depends/packages/unwind.mk | 5 | ||||
| -rw-r--r-- | contrib/depends/patches/unwind/fix_obj_order.patch | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/contrib/depends/packages/unwind.mk b/contrib/depends/packages/unwind.mk index 8b8903a9a..826a820c4 100644 --- a/contrib/depends/packages/unwind.mk +++ b/contrib/depends/packages/unwind.mk @@ -3,6 +3,11 @@ $(package)_version=1.2 $(package)_download_path=https://download.savannah.nongnu.org/releases/libunwind $(package)_file_name=lib$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992 +$(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 &&\ diff --git a/contrib/depends/patches/unwind/fix_obj_order.patch b/contrib/depends/patches/unwind/fix_obj_order.patch new file mode 100644 index 000000000..374a9f04a --- /dev/null +++ b/contrib/depends/patches/unwind/fix_obj_order.patch @@ -0,0 +1,11 @@ +--- 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 + fi ++ oldobjs=`for obj in $oldobjs; do echo $obj; done | sort` ++ oldobjs=" `echo $oldobjs`" + eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" |