Re: [ptxdist] [PATCH] util-linux: fix hexsyntax.c for some systems

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, May 31, 2012 at 05:28:00PM +0200, Andreas Bießmann wrote:
> See patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-use-c.h.patch for
> detailed description.

This occurs when building host-util-linux-ng on Mac OS, right? Please add a
comment for this here.

> Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
> ---
>  .../0004-text-utils-hexsyntax.c-use-c.h.patch      |   32 ++++++++++++++++++++
>  patches/util-linux-2.21.2/series                   |    3 +-
>  2 files changed, 34 insertions(+), 1 deletion(-)
>  create mode 100644 patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-use-c.h.patch
> 
> diff --git a/patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-use-c.h.patch b/patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-use-c.h.patch
> new file mode 100644
> index 0000000..4084af3
> --- /dev/null
> +++ b/patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-use-c.h.patch
> @@ -0,0 +1,32 @@
> +From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann@corscience.de>
> +Date: Tue, 29 May 2012 09:51:24 +0200
> +Subject: [PATCH] text-utils/hexsyntax.c: use c.h
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +This patch hfixes following error for me:
> +---8<---
> +hexsyntax.c: In function 'newsyntax':
> +hexsyntax.c:115: error: 'program_invocation_short_name' undeclared (first use in this function)
> +hexsyntax.c:115: error: (Each undeclared identifier is reported only once
> +hexsyntax.c:115: error: for each function it appears in.)
> +--->8---

This can only happen if program_invocation_short_name is not defined by the
libc (probably glibc specific). Please add something like that to the
comment.
Otherwise, the patch might be removed later because it 'works'.

Michael

> +
> +Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
> +---
> + text-utils/hexsyntax.c |    1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/text-utils/hexsyntax.c b/text-utils/hexsyntax.c
> +index 5cdd1de..74146c8 100644
> +--- a/text-utils/hexsyntax.c
> ++++ b/text-utils/hexsyntax.c
> +@@ -45,6 +45,7 @@
> + #include "hexdump.h"
> + #include "nls.h"
> + #include "strutils.h"
> ++#include "c.h"
> + 
> + off_t skip;				/* bytes to skip */
> + 
> diff --git a/patches/util-linux-2.21.2/series b/patches/util-linux-2.21.2/series
> index 4f56478..45da749 100644
> --- a/patches/util-linux-2.21.2/series
> +++ b/patches/util-linux-2.21.2/series
> @@ -3,4 +3,5 @@
>  0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
>  0002-__progname-redefinition-fix.patch
>  0003-replace-index-with-strchr.patch
> -# 5460ef482e2f1fbfb2002773d7074ab5  - git-ptx-patches magic
> +0004-text-utils-hexsyntax.c-use-c.h.patch
> +# 96d8b4106ab3633e981114542f3d18da  - git-ptx-patches magic
> -- 
> 1.7.10
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de