Re: [ptxdist] [PATCH 2/2] m4: make it build with ICECC again

[Roland Hieber <rhi@pengutronix.de>]

On Fri, Apr 26, 2019 at 07:49:44PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rohieb@rohieb.name>
> ---
>  ...nt-warnings-when-building-with-ICECC.patch | 39 +++++++++++++++++++
>  patches/m4-1.4.18/series                      |  3 +-
>  2 files changed, 41 insertions(+), 1 deletion(-)
>  create mode 100644 patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch
> 
> diff --git a/patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch b/patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch
> new file mode 100644
> index 000000000..979106910
> --- /dev/null
> +++ b/patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch
> @@ -0,0 +1,39 @@
> +From: Roland Hieber <rohieb@rohieb.name>
> +Date: Fri, 26 Apr 2019 19:11:19 +0200
> +Subject: [PATCH] HACK: prevent warnings when building with ICECC
> +
> +If ICECC is enabled, -fdirectives-only is apparently always used, which
> +leads to errors like
> +
> +    verify.h:161:31: error: __COUNTER__ expanded inside directive with -fdirectives-only

Strange, I see the same issue with glib too, and libtasn1, and
host-gettext, and gdbserver. All of them seem to have forked the same
verify.h... :) But I don't think patching all of them is the right way
to approach this.

Debian testing/unstable, ptxdist master, ICECC 1.2.0, host-gcc 8.2.0,
but I also saw this with an old host-gcc 5.4.0, so I guess it's
independent of the host compiler version.

 - Roland

> +
> +when compiling host-m4.  _GL_COUNTER is not used anywhere in the code
> +base, so remove it to get rid of this error.
> +
> +Bug-ICECC: https://github.com/icecc/icecream/issues/414
> +Forwarded: not-needed
> +---
> + lib/verify.h | 10 ----------
> + 1 file changed, 10 deletions(-)
> +
> +diff --git a/lib/verify.h b/lib/verify.h
> +index 5c8381d2906a..40334ceb7c4a 100644
> +--- a/lib/verify.h
> ++++ b/lib/verify.h
> +@@ -154,16 +154,6 @@
> + #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
> + #define _GL_CONCAT0(x, y) x##y
> + 
> +-/* _GL_COUNTER is an integer, preferably one that changes each time we
> +-   use it.  Use __COUNTER__ if it works, falling back on __LINE__
> +-   otherwise.  __LINE__ isn't perfect, but it's better than a
> +-   constant.  */
> +-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
> +-# define _GL_COUNTER __COUNTER__
> +-#else
> +-# define _GL_COUNTER __LINE__
> +-#endif
> +-
> + /* Generate a symbol with the given prefix, making it unique if
> +    possible.  */
> + #define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
> diff --git a/patches/m4-1.4.18/series b/patches/m4-1.4.18/series
> index c9993f086..4432c70dc 100644
> --- a/patches/m4-1.4.18/series
> +++ b/patches/m4-1.4.18/series
> @@ -1,4 +1,5 @@
>  # generated by git-ptx-patches
>  #tag:base --start-number 1
>  0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
> -# b03bed9248af170f04892265a5918d5b  - git-ptx-patches magic
> +0002-HACK-prevent-warnings-when-building-with-ICECC.patch
> +# bf804d896c85607d3736444a83133fe2  - git-ptx-patches magic
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de