From patchwork Tue Feb 11 15:04:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 1236326 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; 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=kAX3BUhO; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48H5fc3BKLz9sP7 for ; Wed, 12 Feb 2020 02:04:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AE7C3204EA; Tue, 11 Feb 2020 15:04:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RLkNt4uUrBIV; Tue, 11 Feb 2020 15:04:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AFC3E20428; Tue, 11 Feb 2020 15:04:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8922C1BF86D for ; Tue, 11 Feb 2020 15:04:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8276287356 for ; Tue, 11 Feb 2020 15:04:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xcAjdrNrgUwH for ; Tue, 11 Feb 2020 15:04:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 96F248733C for ; Tue, 11 Feb 2020 15:04:49 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id y17so12772427wrh.5 for ; Tue, 11 Feb 2020 07:04:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=5RuS8doraJC4MXwBiAO+V6XJJekqP/VmHPd14A2T1cs=; b=kAX3BUhOxP7Mnn3sV/eTHY3ODd+iThqM34ZsPMKQp/SY56pxj4ZT9HK96K7W4eL6pd onNkEOi5MqchOCyDedflEtabP3aCnT/uuGnRjVUjt4jKjS+VCbfjQTvnl5xsARxOc5+i rw6eRM7B9wOLSSlLoYDV88ov0XG/WmMbOiLRP4SlC5d7WNwqmYs3RP34f0mMgIikX52G ZKTRAP90rPbkeY3XOmgIwKOp2XuQxDZ0YqIWNS6NcLYUYR9zc5yGKekF37klmIBBOhO/ bCV2cE0U94Jrzw1P7l4vsEO4f8ISvzN6FayoVu/ztKg27VVTAHKTdIJp/lCb3L7qmwG/ rd1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=5RuS8doraJC4MXwBiAO+V6XJJekqP/VmHPd14A2T1cs=; b=qCmhc9aEFq0hK0mSvhhTkHYwvra56/N750ggRcndn8PmuDDEVDjDugmCSPFDgpTF6u phrWTFZX8Dy/K+IIMDLQ6iChLKEsBDgT8bwl2QlOpC1o4wus/m7oJqk+GNNfGVFvMr3z Jl5XXQYVw3OkuWbCD49z5WYDjzGPJ2IO+JUR5jaZMVf8DCB22RyT71XOWhqAjTM85ZR8 sGQAqylN/z/f7rcXj/cXZScHzY1SLq3mztZ2FICwJG4ljKswtS9UgwlpniVvQE96w9dG ur+roSkCmKGWnLupw894myY5JYxyNfp2swyk2WyYlepzzJIC6NXt6n7Tf41M5TZUE4eu SXXg== X-Gm-Message-State: APjAAAVV8Yax3BLQAfYg8faugm6jeQctKcL95N6VCasgpXDPZIgCxv0X ePaah+7rQ3lvJjjIHM7wUAJAWECI X-Google-Smtp-Source: APXvYqwDSu6HeK2gz8VcBFB5Fj8hSKNsxf/RV/gWwxwDDYBVt6KbR/k3n8QNui5AyGmthdgnivpMTw== X-Received: by 2002:adf:f5cb:: with SMTP id k11mr8845077wrp.63.1581433487750; Tue, 11 Feb 2020 07:04:47 -0800 (PST) Received: from p1g2.work (static-176-159-155-242.ftth.abo.bbox.fr. [176.159.155.242]) by smtp.gmail.com with ESMTPSA id n3sm5559026wrs.8.2020.02.11.07.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 07:04:47 -0800 (PST) Date: Tue, 11 Feb 2020 16:04:45 +0100 From: Gary Bisson To: buildroot@buildroot.org Message-ID: <20200211150445.GA15724@p1g2.work> MIME-Version: 1.0 Content-Disposition: inline Subject: [Buildroot] [PATCH] mfgtools: fix build issue X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The tool fails to build on recent distros due to conflicting declaration of __time64_t. Adding a check around the declaration to avoid redefinition. Patch not submitted upstream as the tool is not supported by NXP anymore[1]. Fixes: http://autobuild.buildroot.net/results/ca4498ad21a96ba2a38ca2467dadffdbb516355b/ [1] https://github.com/NXPmicro/mfgtools/pull/104 Signed-off-by: Gary Bisson --- Hi, As explained in my reply to Jorg's patch that drops mfgtools [1], I'm having second thoughts on this. Maybe this small patch should be included instead of dropping the package? Let me know your thoughts. Regards, Gary [1] http://patchwork.ozlabs.org/patch/1220600/ --- ...onflicting-declaration-of-__time64_t.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch diff --git a/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch b/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch new file mode 100644 index 0000000000..7d0d3974a2 --- /dev/null +++ b/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch @@ -0,0 +1,27 @@ +From 1af7bc09451e0b779f7bfb0dcc58ffb3abe9c584 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Tue, 11 Feb 2020 15:30:12 +0100 +Subject: [PATCH] lnx_def.h: fix conflicting declaration of __time64_t + +Signed-off-by: Gary Bisson +--- + MfgToolLib/lnx_def.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/MfgToolLib/lnx_def.h b/MfgToolLib/lnx_def.h +index c6869dd..a38bb99 100644 +--- a/MfgToolLib/lnx_def.h ++++ b/MfgToolLib/lnx_def.h +@@ -124,7 +124,9 @@ typedef unsigned long * ULONG_PTR; + typedef char * LPOLESTR; + typedef void * HDEVINFO; + typedef unsigned long long ULONGLONG; ++#ifndef __time64_t + typedef long long __time64_t; ++#endif + typedef long long __int64; + typedef unsigned long DWORD_PTR; + typedef unsigned int UINT; +-- +2.25.0 +