From ba50441e5ba948c9f10af7b6b3cc87cb102358d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 10 Aug 2020 18:55:32 +0200 Subject: [PATCH] libunwind: fix build for i686-musl --- srcpkgs/libunwind/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template index 8d287215872..9031e4245cc 100644 --- a/srcpkgs/libunwind/template +++ b/srcpkgs/libunwind/template @@ -14,7 +14,8 @@ checksum=df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435 # LDFLAGS is necessary because libunwind.so itself uses getcontext/setcontext case "$XBPS_TARGET_MACHINE" in - i686-musl|ppc*-musl) makedepends+=" libucontext-devel"; LDFLAGS=" -lucontext" ;; + i686-musl) LDFLAGS=" -lssp_nonshared" ;; + ppc*-musl) makedepends+=" libucontext-devel"; LDFLAGS=" -lucontext" ;; *) ;; esac @@ -27,7 +28,7 @@ pre_configure() { # it needs to be here because it's used directly in a macro in a # public header, so things using libunwind need linkage against it case "$XBPS_TARGET_MACHINE" in - i686-musl|ppc*-musl) + ppc*-musl) vsed -i src/unwind/libunwind.pc.in -e \ 's/\-lunwind/\-lunwind \-lucontext/' ;;