domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libunwind: update to 1.5.0

Browse Source 
Cleanup Makefile for consistency with other ones.

Remove PKG_SSP. It can be fixed with -lssp_nonshared.

Add PKG_BUILD_PARALLEL for faster compilation.

Add zlib dependency. 1.5.0 requires it now.

Refresh patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-12-08 17:56:59 -08:00
committed by Hauke Mehrtens
parent 6cdc21b20e
commit e030a19a57
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
package/libs/libunwind/Makefile
View File

@@ -9,22 +9,22 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libunwind PKG_NAME:=libunwind
PKG_VERSION:=1.3.1 PKG_VERSION:=1.5.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
PKG_HASH:=43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8 PKG_HASH:=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_LICENSE:=X11 PKG_LICENSE:=X11
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:libunwind_project:libunwind PKG_CPE_ID:=cpe:/a:libunwind_project:libunwind
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_SSP:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/libunwind define Package/libunwind
@@ -32,7 +32,7 @@ define Package/libunwind
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=The libunwind project TITLE:=The libunwind project
URL:=http://www.nongnu.org/libunwind/ URL:=http://www.nongnu.org/libunwind/
DEPENDS:=@((mips||mipsel||x86_64||arm||aarch64)||(USE_GLIBC&&(powerpc||i386))) DEPENDS:=@((mips||mipsel||x86_64||arm||aarch64)||(USE_GLIBC&&(powerpc||i386))) +zlib
ABI_VERSION:=8 ABI_VERSION:=8
endef endef
@@ -43,8 +43,9 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-documentation \ --disable-documentation \
--disable-tests \ --disable-tests \
--enable-minidebuginfo=no \ --disable-minidebuginfo
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lssp_nonshared)
define Package/libunwind/install define Package/libunwind/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib

6
package/libs/libunwind/patches/002-fix-building-getcontext_S.patch
View File

@@ -1,6 +1,5 @@
diff -uprN a/src/mips/getcontext.S b/src/mips/getcontext.S --- a/src/mips/getcontext.S
--- a/src/mips/getcontext.S 2012-10-06 12:54:38.000000000 +0800 +++ b/src/mips/getcontext.S
+++ b/src/mips/getcontext.S 2016-06-08 13:35:25.033051679 +0800
@@ -24,12 +24,12 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING @@ -24,12 +24,12 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
@@ -16,4 +15,3 @@ diff -uprN a/src/mips/getcontext.S b/src/mips/getcontext.S
# define OFFSET 4 # define OFFSET 4
# else # else
# define OFFSET 0 # define OFFSET 0

8
package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch
View File

@@ -1,7 +1,6 @@
diff -uprN a/include/libunwind-mips.h b/include/libunwind-mips.h --- a/include/libunwind-mips.h
--- a/include/libunwind-mips.h 2012-10-06 12:54:38.000000000 +0800 +++ b/include/libunwind-mips.h
+++ b/include/libunwind-mips.h 2016-06-08 13:55:55.029436442 +0800 @@ -114,6 +114,42 @@ typedef enum
@@ -111,6 +111,42 @@ typedef enum
} }
mips_regnum_t; mips_regnum_t;
@@ -44,4 +43,3 @@ diff -uprN a/include/libunwind-mips.h b/include/libunwind-mips.h
typedef enum typedef enum
{ {
UNW_MIPS_ABI_O32, UNW_MIPS_ABI_O32,