From patchwork Wed Oct 28 23:18:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1389598 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=none (p=none dis=none) header.from=hauke-m.de 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=dZtvqwhl; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hauke-m.de header.i=@hauke-m.de header.a=rsa-sha256 header.s=MBO0001 header.b=dzsFtOoI; 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 4CM4Lz4MnLz9sTD for ; Thu, 29 Oct 2020 10:20:59 +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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uDbap/xvr81fHH9d7FFdRyHCQGthidde0VIUAW7/aQE=; b=dZtvqwhljDcs5xCRNnRnfZ8tK LFwmpvbAFr253tfdbUqZ6y3KHgTVbsvzd4WA1+xZzDlq1veoN7A2DCLn7N/3uJ0UAYTX4kDVVhfM4 C4p/cO79PRUTbDzuTOGM1vBPSecMe4nwAruzaVlWEggdrJS5h1RG2LJ5TrQlzi/zJomRgB3UF6jUh uPRaR6cmz78+/lNRh+szD5MmyL/ExkTi3z6Oq65e91dTzqFvT03d4BTOuznLHndhN9BEUwCblLPRO gmSQNHoLYqJsLyXPf79NEzyN+Xs9VNXgaGJ99GUtb612kLMeub5hfIAlxyFycNgEW9BgqtXTdN5Rt r3y2UFZmw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXuiY-0001Gc-5Z; Wed, 28 Oct 2020 23:18:58 +0000 Received: from mout-p-202.mailbox.org ([80.241.56.172]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXuiR-0001EE-GR for openwrt-devel@lists.openwrt.org; Wed, 28 Oct 2020 23:18:53 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4CM4JV4s43zQlFN; Thu, 29 Oct 2020 00:18:50 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1603927123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DaOsiYuHS/4h4MQM2O63DOs7SCxz+NeYYqOALeOicqY=; b=dzsFtOoI1sJXRuT5WWdbWZJU/yLQ5Rq0iiJOS9QqZ7G4bx/J/+OWFIdH4YUGLoV6WKgB3M NZw6PjtyHjb4foD1TPdHk3rVZZjq8wDS/EQi4WBx3PJ4GeXHcDwtin1qxDMkDHBcz8A68Q DncZcllTKfHa7ysFcgnqF66AMUwQtc34uQPDCUepkgT6ff0LRk1i+0CmidPy3/t7XabxQT u7KkQ9sj+EKIKT9KZESooFnHGo5yrB6S5MVW2Aky6blvcE2UkDl6ZjXXvS95/QcR3wVyTH s3y76H2ngbz3PWilVoug8vKt8WEDt1/xIH2wjCWZJA+cNeaJLHSl6KTD9wBU9Q== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id M02tLGfRcz_T; Thu, 29 Oct 2020 00:18:41 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Subject: [PATCH 4/5] gdb: Always use system zlib Date: Thu, 29 Oct 2020 00:18:24 +0100 Message-Id: <20201028231825.6597-4-hauke@hauke-m.de> In-Reply-To: <20201028231825.6597-1-hauke@hauke-m.de> References: <20201028231825.6597-1-hauke@hauke-m.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -6.43 / 15.00 / 15.00 X-Rspamd-Queue-Id: 041DF15 X-Rspamd-UID: caa3de X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201028_191851_808013_AB706E06 X-CRM114-Status: GOOD ( 14.39 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.172 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: , Cc: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Instead of using the system zlib when the package is selected and using the internal zlib if it is not selected in OpenWrt, just activate it always. This should make the package more deterministic. Signed-off-by: Hauke Mehrtens --- package/devel/gdb/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile index 9817599558cd..50d43e9fc193 100644 --- a/package/devel/gdb/Makefile +++ b/package/devel/gdb/Makefile @@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk define Package/gdb/Default SECTION:=devel CATEGORY:=Development - DEPENDS:=+!USE_MUSL:libthread-db +PACKAGE_zlib:zlib + DEPENDS:=+!USE_MUSL:libthread-db +zlib URL:=https://www.gnu.org/software/gdb/ endef @@ -55,6 +55,7 @@ endef # XXX: add --disable-werror to prevent build failure with arm CONFIGURE_ARGS+= \ --with-system-readline \ + --with-system-zlib \ --without-expat \ --without-lzma \ --disable-sim \