From patchwork Sun Jul 10 23:43:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Mentovai X-Patchwork-Id: 1654608 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: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=T1xMNIMA; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=mentovai.com header.i=@mentovai.com header.a=rsa-sha256 header.s=google header.b=kCDu0LAh; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lh3Y14C1nz9s09 for ; Mon, 11 Jul 2022 09:45:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=s43+yuSRjf1axMwg4+DOFNmhMJxEyTy0FbBcmRE8Q54=; b=T1xMNIMAJIXSER BCKPv/WLhZcLBW3rZjxeHjnGVXp9vMh/1T3SAKHw2foSsYa2wh5lVzv+/ieybUwlvg9fU6qnWxtWD 4hzPdP9ypB4ukjBYB2bX0NNEeagSIVUzMajBrz7roZEEZ2ZdGJzuHsb4uix+fJachCcPUtS3lDVge /kx5MXK0z4bTmi3dNO6XRiyuoiFnn9FVjMJH97h7yMxmCuS0eSsdmEdZ3H3i7Du4Y8WEM5mGdgW3A bPrRWRfRzF3z4+xhPD/zplEQUhiKXWg2utLip9yDjeXxYPEemvhW+Qts0hHPZkQI7JHKhvpzuRtTl Ux065V5Ic/XxSzLigUsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAgaS-00ELR4-U1; Sun, 10 Jul 2022 23:43:41 +0000 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAgaO-00ELO1-TT for openwrt-devel@lists.openwrt.org; Sun, 10 Jul 2022 23:43:38 +0000 Received: by mail-qk1-x72b.google.com with SMTP id f14so2841416qkm.0 for ; Sun, 10 Jul 2022 16:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mentovai.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DIlQMfTnzMhLZix8gLEhK4uVFOSNsuQoIeRrQMfJpeE=; b=kCDu0LAhK9Y/szqJWlY2UcGTcsafLp/CLF7qNVa/kKLRQvnZdMmknpHC4dipEvwqXr pipVMzZNZFRqE6RwneSxG0FMbtgAXaX5JskSVj3anhN71XaoGmQ0YnZ6xjQ6/YACokW7 IAHOEVSbuTy9MWyAyKb+UAiLzrWLFi0NCC3/o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DIlQMfTnzMhLZix8gLEhK4uVFOSNsuQoIeRrQMfJpeE=; b=L4OcZXkjrd6od33bqXU73yd+sZljeRXJObsX7eLw0jxJON688XxA33seEH5Wil/PxI 8KQXUsf9TWZGtk6bJDFK3dvbqhOW/pAxRNG64YoHfS99OLh1jtC8jvlCIBp6yIVZLuNg JmEaKUaDG0PtDDu6nq86q5OAeivauVtiWo54C8XLDt9YJdoQCkDiIWS0AltAnzHCNinh c9ONn3+EYAJ+KxmZGYyC8gBeCQX5eBZrwTSdRazikADbG0KN070LmAWxO4zUH6tFPbX7 4a7W4mTKFH69JraDlPPrdHtx+Ai3jpr6QM5l1iQnUGRo9g8HR18YEqQefqeDamLbc8nN Ydqg== X-Gm-Message-State: AJIora90A0yEhbwv3kccAbcE2QmsSLVepxj2k8B+rG3wTMZEvA8Qft5F xLSg3S+eZNUD76WvTKDRb/rgyMXIvTX2ymd4 X-Google-Smtp-Source: AGRyM1v3U+3dbQa/Kb+CPAMofEtgSYIPOPY9QwYPd8knCmJs2rE+YA69Ua4kEGkdN+atPDSpI2wTAg== X-Received: by 2002:a05:620a:2592:b0:6b2:7b63:9772 with SMTP id x18-20020a05620a259200b006b27b639772mr9863832qko.119.1657496615245; Sun, 10 Jul 2022 16:43:35 -0700 (PDT) Received: from redacted (pool-100-33-93-50.nycmny.fios.verizon.net. [100.33.93.50]) by smtp.gmail.com with ESMTPSA id t16-20020a05622a149000b00304e33f21f7sm4346793qtx.68.2022.07.10.16.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Jul 2022 16:43:34 -0700 (PDT) From: Mark Mentovai To: openwrt-devel@lists.openwrt.org, Hauke Mehrtens Cc: Jo-Philipp Wich Subject: [PATCH v2] libmnl: fix build when bash is not located at /bin/bash Date: Sun, 10 Jul 2022 19:43:05 -0400 Message-Id: <20220710234305.71732-1-mark@mentovai.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220621143342.90040-1-mark@mentovai.com> References: <20220621143342.90040-1-mark@mentovai.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220710_164336_967594_806D79F4 X-CRM114-Status: GOOD ( 12.72 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This fixes the libmnl build on macOS, which ships with an outdated bash at /bin/bash. During the OpenWrt build, a modern host bash is built and made available at staging_dir/host/bin/bash, which is pr [...] Content analysis details: (-0.2 points, 5.0 required) 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:72b listed in] [list.dnswl.org] -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_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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.34 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 This fixes the libmnl build on macOS, which ships with an outdated bash at /bin/bash. During the OpenWrt build, a modern host bash is built and made available at staging_dir/host/bin/bash, which is present before /bin/bash in the build's PATH. This is similar to 8f7ce3aa6dda, presently appearing at package/kernel/mac80211/patches/build/001-fix_build.patch. Signed-off-by: Mark Mentovai --- package/libs/libmnl/patches/001-fix_build.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/libs/libmnl/patches/001-fix_build.patch diff --git a/package/libs/libmnl/patches/001-fix_build.patch b/package/libs/libmnl/patches/001-fix_build.patch new file mode 100644 index 000000000000..030020abacbe --- /dev/null +++ b/package/libs/libmnl/patches/001-fix_build.patch @@ -0,0 +1,11 @@ +--- a/doxygen/Makefile.am ++++ b/doxygen/Makefile.am +@@ -21,7 +21,7 @@ + # The command has to be a single line so the functions work + # and so `make` gives all lines to `bash -c` + # (hence ";\" at the end of every line but the last). +- /bin/bash -p -c 'declare -A renamed_page;\ ++ bash -p -c 'declare -A renamed_page;\ + main(){ set -e; cd man/man3; rm -f _*;\ + count_real_pages;\ + rename_real_pages;\