From patchwork Wed Dec 9 01:56:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1413117 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=S4Js9bj2; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=T0TdWRNo; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CrKwd5Gjpz9sWC for ; Wed, 9 Dec 2020 12:59:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=GPx7bJ14BGr6awzcG0viDJm6h9t9C8xFIc6d1aJ7PPA=; b=S4Js9bj28UththuWUlKTcExNJz KEkn/N0xDGdonB7jYFjoXS2IVYfUA6OIkLNhk6qkIJOOvjhJ7DVV3Y/mgB6W/9wfR4MhZCZRpvtOU if5L9SsV4Y8P86O3OnCIUCT0yYDYwC2KXO9uiLYvwms1XHAsZG0y1zZcL1YbmbtnL1K/uvdmZQl+0 ZDlWDQr/164z1HUUn8RPPaqTS+rrcYGuuUrZQE6fNmzbnO7qjllRn0Cj1cX0dUdSxkfXq+RHf92cX V5O0SP2iRAHiok3J3eyoxb2L5YFYcqAQKJQ+Dm8QPsky/b680bZP2BqWh+TM9UrqutbBCEfDovR/V PGe/Ga1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmoj4-0004gH-Bu; Wed, 09 Dec 2020 01:57:06 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmoj1-0004fu-OW for openwrt-devel@lists.openwrt.org; Wed, 09 Dec 2020 01:57:04 +0000 Received: by mail-pf1-x443.google.com with SMTP id s21so424894pfu.13 for ; Tue, 08 Dec 2020 17:57:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rViG/iS+ZdMjLUZotJ3OTqU+QSU5aPS+2ivcbnqdNow=; b=T0TdWRNoqNkgLXhewQf6p/JHnM/KivXGOq/0+MgdROMn6xlwDg0ezsff7owGQbr/73 Pix/z1BbjjYLqqYxvgnuyAwk5zXR3Rs7mk+f5fQYyotS5AIFBfR76dYxtD31GoG1vssk JBlfZj5Pl+PX+dYoYBy8GXIJljTWPlnLFOLyzaacV7SI9DhtAlKAGfQc+mEQUkajfxS4 SUCfMdKHAiAqIaUXWHmA7dNZD4RzYUH8rseulTPHgXPQJe4cVAFjNeHEn/1Lm/eO8e88 a+99KlVEQfSgC54e6nlf20ja/CiXNaThuX75atn7F8YOygDOP3OUaDyvBICkBlW9kFKu d83w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rViG/iS+ZdMjLUZotJ3OTqU+QSU5aPS+2ivcbnqdNow=; b=sfMpNMxxArCnzm8eB1Bh9IYPZQG4UzEhsrjHSVTiNDNe1wngFS09nN6XkzVGmGZ3kk YkahYmrt+TK1mGXwNPaqN+lPgq6p14thfLbFHS16Zuym2T6mQ/DfxEhMBOgeTLuntGda YLTY9ZS1a9F2Ccrs5jEa0EnNSREql1srCVoJe81P4VLZXNcrc5CIJJpw0U82pk9Ks9W8 wBQFeu80l3dGY4kqgZjjgUz0F/Fa7oCpjH5gAksGEkDCb9Ov35MxztX80eb+nOU5TflE S0snJDeIZWCDz+D3fyiVN8OxyiblPi0XMtcE0Qyxp99gbrCo0X0SJibmrHkLeOKt04cr gf3Q== X-Gm-Message-State: AOAM533fF/Jv26niSOm5m3IcdSm5/SsOg3Cl3W5h41naMdlw/r7uxiHn xB/Mj3Qmy6UdHrW+QnPt4WBf2R3bXQ0dxw== X-Google-Smtp-Source: ABdhPJzw76tIfNa/OpTyvTrtDOEzJANthl9Md3uCK0m3Vw+rIq7Tx2onMrYAcj7/8flyFe3kaIphDg== X-Received: by 2002:aa7:824d:0:b029:18b:ad77:1a2b with SMTP id e13-20020aa7824d0000b029018bad771a2bmr1545pfn.25.1607479021287; Tue, 08 Dec 2020 17:57:01 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id t9sm55237pjq.46.2020.12.08.17.57.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 17:57:00 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] libunwind: update to 1.5.0 Date: Tue, 8 Dec 2020 17:56:59 -0800 Message-Id: <20201209015659.47019-1-rosenp@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201208_205703_880318_595CA834 X-CRM114-Status: GOOD ( 11.50 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- package/libs/libunwind/Makefile | 17 +++++++++-------- .../patches/002-fix-building-getcontext_S.patch | 6 ++---- .../003-fix-missing-ef_reg-defs-with-musl.patch | 8 +++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/package/libs/libunwind/Makefile b/package/libs/libunwind/Makefile index 994ee97a17..89e6f84ff5 100644 --- a/package/libs/libunwind/Makefile +++ b/package/libs/libunwind/Makefile @@ -9,22 +9,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libunwind -PKG_VERSION:=1.3.1 +PKG_VERSION:=1.5.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) -PKG_HASH:=43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8 -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 +PKG_HASH:=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 +PKG_MAINTAINER:=Yousong Zhou PKG_LICENSE:=X11 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:libunwind_project:libunwind -PKG_MAINTAINER:=Yousong Zhou +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 -PKG_SSP:=0 include $(INCLUDE_DIR)/package.mk define Package/libunwind @@ -32,7 +32,7 @@ define Package/libunwind CATEGORY:=Libraries TITLE:=The libunwind project 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 endef @@ -43,8 +43,9 @@ endef CONFIGURE_ARGS += \ --disable-documentation \ --disable-tests \ - --enable-minidebuginfo=no \ + --disable-minidebuginfo +TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lssp_nonshared) define Package/libunwind/install $(INSTALL_DIR) $(1)/usr/lib diff --git a/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch b/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch index 10b1dd1d90..d88594e6e7 100644 --- a/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch +++ b/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch @@ -1,6 +1,5 @@ -diff -uprN a/src/mips/getcontext.S b/src/mips/getcontext.S ---- a/src/mips/getcontext.S 2012-10-06 12:54:38.000000000 +0800 -+++ b/src/mips/getcontext.S 2016-06-08 13:35:25.033051679 +0800 +--- a/src/mips/getcontext.S ++++ b/src/mips/getcontext.S @@ -24,12 +24,12 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING 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 # else # define OFFSET 0 - diff --git a/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch b/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch index 465abb4ce0..1a26dcd895 100644 --- a/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch +++ b/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch @@ -1,7 +1,6 @@ -diff -uprN a/include/libunwind-mips.h b/include/libunwind-mips.h ---- a/include/libunwind-mips.h 2012-10-06 12:54:38.000000000 +0800 -+++ b/include/libunwind-mips.h 2016-06-08 13:55:55.029436442 +0800 -@@ -111,6 +111,42 @@ typedef enum +--- a/include/libunwind-mips.h ++++ b/include/libunwind-mips.h +@@ -114,6 +114,42 @@ typedef enum } mips_regnum_t; @@ -44,4 +43,3 @@ diff -uprN a/include/libunwind-mips.h b/include/libunwind-mips.h typedef enum { UNW_MIPS_ABI_O32, -