mfgtools: fix build issue
PATCH 1/1 mfgtools: fix build issue
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
---
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
package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 1af7bc09451e0b779f7bfb0dcc58ffb3abe9c584 Mon Sep 17 00:00:00 2001 +From: Gary Bisson <[email protected]> +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 <[email protected]> +--- + 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 +
Signature · 1 line
2.25.0
PATCH 1/1 mfgtools: fix build issue
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gary" == Gary Bisson <[email protected]> writes:
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/
Quoted 8 lines
Signed-off-by Gary Bisson <[email protected]>---
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?
I didn't see any feedback (But you didn't add Joern in To). I don't really know much about the imx SW, but as this is a trivial patch I've applied it.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 mfgtools: fix build issue
Quoted 19 lines
Quoted 18 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
"Peter" == Peter Korsgaard <[email protected]> writes:
"Gary" == Gary Bisson <[email protected]> writes:
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 <[email protected]>---
Hi,
Quoted 8 lines
Quoted 4 lines
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?I didn't see any feedback (But you didn't add Joern in To). I don't really know much about the imx SW, but as this is a trivial patch I've applied it.
Committed to 2019.02.x and 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard