From patchwork Tue Nov 24 10:04:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1405396 X-Patchwork-Delegate: ynezz@true.cz 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=sy+ZM4vE; 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=gFb8i0GF; 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 4CgKRd0cXqz9s1l for ; Tue, 24 Nov 2020 21:06:20 +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: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:In-Reply-To:References:List-Owner; bh=9ircIIQDT2eRx+fe2OMYsvm3Zz1kLlF8Gkr8ZZMMPHk=; b=sy+ZM4vEq0IhecJSNRFVS+q2q9 1m9fftuQDSiuyShtF9uj46jpJDqqA00KnKZDNE7LPAezwRrfKirc3rRiDXzObbnAtDy/wuazUwGDl zLebVCqz2XMtW6GNiLUWDM6r5YsMK/124Nu/oKyzNRP29ivzIXaEYNQeFP2Vh/WQPVIkSPRs/A6kt i9DOn7s7+/7Bl63xIhFg/eKx+WP4BGjpTiiOWfYe5kNhPF9WBbGMpZX5pZr9kGbW8GfWYGV1hwMO1 6lgjXfDexs5GlEGjaBIOeivVqmD8r5Iock/+BaBFLSU+hoak7hVo7qkcefHPhWooPOoxMX6uR2/As QJX9jV2g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khVBW-0004Yh-Ok; Tue, 24 Nov 2020 10:04:30 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khVBU-0004Y8-29 for openwrt-devel@lists.openwrt.org; Tue, 24 Nov 2020 10:04:28 +0000 Received: by mail-pf1-x441.google.com with SMTP id t8so18000669pfg.8 for ; Tue, 24 Nov 2020 02:04:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VfhyNmZuxeYfeqDq4QjtL8+8Q+wytYDYAj0rK0ks7HA=; b=gFb8i0GF8+S4YAzKk6DyPNG0rE576C7ZOfqnKuDv0YfhC0l1mZEJZwP6Rd43gofk9N MP/M9QhSrlJudTma3/KjV/Ons1UE4Vlv7PH7Es8xGPRBkjX85lxP8rFJw05PhMFU1LSZ 3oAEKtGyvlrXRnUrQmm1zTtsYDHx9jodKDumeMgsun85evWn1b6BjRT+jnHjCDu/084F M8G14JcyqQnNfQDL4GLXeovLDH5czxxM3UvfxUrbmFrHjmm4ghPj2CutE6L8SwnOoGpa M59zOPCajCa6f/PmAjqRae2m0x7neBXpGhslEfOgpFCA1JdLodVsT8TsTtrhXpTLJkDT Xkuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VfhyNmZuxeYfeqDq4QjtL8+8Q+wytYDYAj0rK0ks7HA=; b=p5sVHGZcLjTN9XmsoRqHACsZw9UW7ZDDYu1yKq/1tyBDhIjBqUGf0dQMf7lES1fCnS 9/OyRwcNeO42YvsroEP2DNpxDvKiU5e7BQzjcjBSWxoeGb1Bo8hQLmP4ua7CeiCv51ut rfINjpRyLqRlfdtOu86rHgrTmqu0m+e5vUwNWvzg8btQmSJigc56FCjHL/zjl5u1yvXt WUhu8HHsMwWk/IxczT6iqgOTJJI7s0ZQVCohFKvl5ziwHPCEDlGHP6lMMcI//7PFuQFT +SYwjgIOemqLa1Fvwq6UT5gFp1I9+W78IgXC4U3K03l/Sr7HpTQlFuvl2ffhcwdqoa1f ukLQ== X-Gm-Message-State: AOAM532PJ2Ckz4bi5DgZKMlVobLsqySdsLGtfyTZqj/ViBps7nJO+BVr nfOFSYWexqsCdfY2wd4FgAbx8rHZ0Ol8Hg== X-Google-Smtp-Source: ABdhPJzK4rBim4uMC9zg0ZxrLm9bs3jh7+KGJV3fPUaz9tQhpnGllEpjyRum20w/mSzAZkP/wFVA9A== X-Received: by 2002:a17:90b:14c:: with SMTP id em12mr4167824pjb.170.1606212266159; Tue, 24 Nov 2020 02:04:26 -0800 (PST) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id a12sm14475433pfl.191.2020.11.24.02.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Nov 2020 02:04:25 -0800 (PST) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] openssl: fix compilation Date: Tue, 24 Nov 2020 02:04:24 -0800 Message-Id: <20201124100424.585944-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-20201124_050428_139562_2909DB92 X-CRM114-Status: GOOD ( 14.59 ) 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:441 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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.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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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: cote2004-github@yahoo.com Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org It seems the Makefile wrongly picks up dist CC and matches on a clang path. Fixes: mips-openwrt-linux-musl-gcc: error: unrecognized command-line option '-Qunused-arguments' Signed-off-by: Rosen Penev --- package/libs/openssl/Makefile | 2 +- package/libs/openssl/patches/101-Configure-typo.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 package/libs/openssl/patches/101-Configure-typo.patch diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 9696748106..325c736ed4 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=openssl PKG_BASE:=1.1.1 PKG_BUGFIX:=h PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 ENGINES_DIR=engines-1.1 diff --git a/package/libs/openssl/patches/101-Configure-typo.patch b/package/libs/openssl/patches/101-Configure-typo.patch new file mode 100644 index 0000000000..2a2344ff82 --- /dev/null +++ b/package/libs/openssl/patches/101-Configure-typo.patch @@ -0,0 +1,11 @@ +--- a/Configure ++++ b/Configure +@@ -1444,7 +1444,7 @@ if (!$disabled{asm} && !$predefined_C{__MACH__} && $^O ne 'VMS') { + # but it apparently recognizes the option in question on all + # supported platforms even when it's meaningless. In other words + # probe would fail, but probed option always accepted... +- push @{$config{cflags}}, "-Wa,--noexecstack", "-Qunused-arguments"; ++ push @{$config{cflags}}, "-Wa,--noexecstack"; + } else { + my $cc = $config{CROSS_COMPILE}.$config{CC}; + open(PIPE, "$cc -Wa,--help -c -o null.$$.o -x assembler /dev/null 2>&1 |");