From patchwork Tue Oct 8 01:02:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173047 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 (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.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; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LNIf6q0k"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LxxN131/"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 46nJyZ5fkmz9sPT for ; Tue, 8 Oct 2019 12:04:06 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Bz+UlFsdg1CMAi8vVe373XNNMnelNlIWl7T2nZXYsds=; b=LNIf6q0kFnyo8PiuCeye1Bg1CU a2CW2t4lThpP7O5MoMHsjevwzCgzhpE4gh/9iePpCgHTTklmQPTtxCjCtxmu2Ql0PsAfX3v5Iwh7H Jeyc+RbrvXSjTpK1VnXPkSGvdvwHFwCePnwBMtfyLRoT2QbQFN4XCz8EG06Cueey4vk0tRhRkBl1G X2SiDkbljsQEeFm96uyA3F6szeztSUFW53HmsvVH3DHCxD4MVFDExoMlEmJ+oHqxUJ61MQLa3RZop L+RO7lJrqpyirJdO7MGMcnZnQjeywRmu+u7N6j/FEDc32v0i5kFrJ/RQNBkHgRVBX28NebZyvTDnp up2PrnAQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdv2-0007U7-TZ; Tue, 08 Oct 2019 01:04:04 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtW-0005lb-S3 for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:36 +0000 Received: by mail-pg1-x534.google.com with SMTP id z12so9249585pgp.9 for ; Mon, 07 Oct 2019 18:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HjkYFuVMlxwLNI93iVzAAFFPIxqf2OgmC0MUG7PXYrE=; b=LxxN131/HUwAiM868sZXvFfsWRYh8iuOrmEUQ3OjkFXkZKD4lIWesBFSv2eBhNmV6o SHOjsSd22PqrLeycGSoSx0/71X+R1dh03vpck1L0a6nc3zqQLV+6KUhF5PCfDR4t22tc dld8eIi0KZcreXNxfmB6GAiymDena16k3ycRHwMEKmif2j9bGs76Gic4lIKJ9zbKSMiW f+916SGHHMKNH69aTBj2hG5qxnCcr99/se0Pq0M/58P/8LR5v/AqCzv3eFI1YcrPBZWI C0Zvv6/oLvdMAWIJDf4TsxUJrLq5FAFtXwYsWRJLj5+/5JumcH7QJHmbm8ETW4zEEX1X wg8w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=HjkYFuVMlxwLNI93iVzAAFFPIxqf2OgmC0MUG7PXYrE=; b=jTPMpvbTvnUE49U7aMhLxzebTwEgP94nlnPTt7EEL0ESGKIEkJgX6h6qtVsNBtmDy3 DgYBlkfIYqdVOO95HHgxelBKMw0O61b5rSGgre+acLgmND8oIh64yG31TOEBRrykp6Eo /9h2DS3umH9XSweIasebT6imlCQIaAezK/fTOGiYpFrP+yS46KNYVr1k7Lu82AxwbEur KbvH63wz4aBYVO8TQRqmH2tpZTJwR4cNegODcvVw2GFS+e+Dce9R+v17tXQ68Y+xHebQ Q6WSiGsPbuGMHPnZI16n8GDORvvKW15d2Akw8dpgDQEoVt0+0TJ8mWiDe0XhrKSDhLVH 9YVQ== X-Gm-Message-State: APjAAAVAGqBm+Rbuvrq5exits7YkwH8wpeHOsnn20yJsr6CyIni4P79a mPqb1NyKHPeYT7WUxpPrcMDA2PYh X-Google-Smtp-Source: APXvYqyzsP9+VizaOsNglx96nb0qUMoxuEoHm9nIpXBqrgjWDd5rIq8wvYe+mCJEA7r2HiIcSSBLHQ== X-Received: by 2002:a17:90a:17c5:: with SMTP id q63mr2463711pja.106.1570496549628; Mon, 07 Oct 2019 18:02:29 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:29 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:20 -0700 Message-Id: <20191008010225.8822-3-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180230_904910_2708BE37 X-CRM114-Status: GOOD ( 14.51 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.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:534 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.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -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 Subject: [OpenWrt-Devel] [PATCH 3/8] tools/dosfstools: Replace iconv patch with upstream submission X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 It allows more platforms to be able to build it such as Cygwin. This is the same patch currently in the packages repo. Signed-off-by: Rosen Penev --- ..._CHECK_LIB-for-iconv-library-linking.patch | 27 ------------------- tools/dosfstools/patches/010-iconv.patch | 26 ++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch create mode 100644 tools/dosfstools/patches/010-iconv.patch diff --git a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch b/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch deleted file mode 100644 index ea93320821..0000000000 --- a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1c6c135ee15e449c1bf2e76d5307f83a3a1d7425 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= -Date: Tue, 11 Oct 2016 12:07:48 +0200 -Subject: [PATCH] Switch to AC_CHECK_LIB for iconv library linking. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -AC_SEARCH_LIB doesn't work properly for openwrt/lede when building dosfstools -as a package. - -Signed-off-by: Álvaro Fernández Rojas ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ if test "x$with_udev" != "xno"; then - [true]) - fi - --AC_SEARCH_LIBS(iconv_open, iconv) -+AC_CHECK_LIB(iconv, iconv_open) - - # xxd (distributed with vim) is used in the testsuite - AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) diff --git a/tools/dosfstools/patches/010-iconv.patch b/tools/dosfstools/patches/010-iconv.patch new file mode 100644 index 0000000000..04d402bf3b --- /dev/null +++ b/tools/dosfstools/patches/010-iconv.patch @@ -0,0 +1,26 @@ +From e18bcc65d5772e518c6496b439bad8a986f7e434 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Thu, 20 Jun 2019 15:18:19 -0700 +Subject: [PATCH] configure: Fix iconv check for cross compilation + +AC_CHECK_LIB is more friendly towards cross-compilation. + +Added check for libiconv_open as that can be used when the libc lacks iconv. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 07e8703..1b09964 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,7 +75,8 @@ if test "x$with_udev" != "xno"; then + [true]) + fi + +-AC_SEARCH_LIBS(iconv_open, iconv) ++AC_CHECK_LIB(iconv, iconv_open) ++AC_CHECK_LIB(iconv, libiconv_open) + + # xxd (distributed with vim) is used in the testsuite + AC_CHECK_PROG([XXD_FOUND], [xxd], [yes])