Skip to content

Commit

Permalink
Fix unwind library ordering
Browse files Browse the repository at this point in the history
Sort objects being archived
  • Loading branch information
hyc committed Nov 17, 2019
1 parent 5eea312 commit 9cbba5a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
5 changes: 5 additions & 0 deletions contrib/depends/packages/unwind.mk
Expand Up @@ -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 &&\
Expand Down
11 changes: 11 additions & 0 deletions 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"

0 comments on commit 9cbba5a

Please sign in to comment.