* [ptxdist] [PATCH 1/2] m4: re-export patches with git-ptx-patches @ 2019-04-26 17:49 Roland Hieber 2019-04-26 17:49 ` [ptxdist] [PATCH 2/2] m4: make it build with ICECC again Roland Hieber 0 siblings, 1 reply; 5+ messages in thread From: Roland Hieber @ 2019-04-26 17:49 UTC (permalink / raw) To: ptxdist; +Cc: Alexander Dahl, Roland Hieber Signed-off-by: Roland Hieber <rohieb@rohieb.name> --- .../0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch index 00b99fdd9..511a30522 100644 --- a/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch +++ b/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch @@ -1,6 +1,9 @@ From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 8 Mar 2018 16:42:45 2018 -0800 +Date: Thu, 8 Mar 2018 16:42:45 -0800 Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Problem reported by Daniel P. Berrangé in: https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] m4: make it build with ICECC again 2019-04-26 17:49 [ptxdist] [PATCH 1/2] m4: re-export patches with git-ptx-patches Roland Hieber @ 2019-04-26 17:49 ` Roland Hieber 2019-04-26 18:42 ` Roland Hieber 0 siblings, 1 reply; 5+ messages in thread From: Roland Hieber @ 2019-04-26 17:49 UTC (permalink / raw) To: ptxdist; +Cc: Alexander Dahl, Roland Hieber 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 + +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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] m4: make it build with ICECC again 2019-04-26 17:49 ` [ptxdist] [PATCH 2/2] m4: make it build with ICECC again Roland Hieber @ 2019-04-26 18:42 ` Roland Hieber 2019-04-26 19:08 ` Alexander Dahl 0 siblings, 1 reply; 5+ messages in thread From: Roland Hieber @ 2019-04-26 18:42 UTC (permalink / raw) To: ptxdist; +Cc: Alexander Dahl 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] m4: make it build with ICECC again 2019-04-26 18:42 ` Roland Hieber @ 2019-04-26 19:08 ` Alexander Dahl 2019-04-26 19:16 ` Roland Hieber 0 siblings, 1 reply; 5+ messages in thread From: Alexander Dahl @ 2019-04-26 19:08 UTC (permalink / raw) To: Roland Hieber; +Cc: Alexander Dahl, ptxdist [-- Attachment #1.1: Type: text/plain, Size: 2327 bytes --] Hei hei, I brought this up on IRC yesterday, I just tried to compile DistroKit master on Debian 10 (buster) on an amd64 host, with some Debian 9 (stretch) icecc nodes on the local net. On Fri, Apr 26, 2019 at 08:42:53PM +0200, Roland Hieber wrote: > 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. I only saw the issue with host-m4. > 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. Could the difference be in the icecc version on the host? Debian 9 has ICECC 1.0.1 and does not fail. Debian 10 has ICECC 1.2.0 and fails. Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 91 bytes --] _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] m4: make it build with ICECC again 2019-04-26 19:08 ` Alexander Dahl @ 2019-04-26 19:16 ` Roland Hieber 0 siblings, 0 replies; 5+ messages in thread From: Roland Hieber @ 2019-04-26 19:16 UTC (permalink / raw) To: ptxdist On Fri, Apr 26, 2019 at 09:08:55PM +0200, Alexander Dahl wrote: > Hei hei, > > I brought this up on IRC yesterday, I just tried to compile DistroKit > master on Debian 10 (buster) on an amd64 host, with some Debian 9 > (stretch) icecc nodes on the local net. > > On Fri, Apr 26, 2019 at 08:42:53PM +0200, Roland Hieber wrote: > > 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. > > I only saw the issue with host-m4. Well, host-m4 is probably the first of those packages that gets compiled, because autotools depend on m4, and therefore most other packages :) > > 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. > > Could the difference be in the icecc version on the host? Debian 9 has > ICECC 1.0.1 and does not fail. Debian 10 has ICECC 1.2.0 and fails. Indeed, there is this commit between ICECC 1.1 and 1.2 that adds -fdirectives-only to the gcc command line: https://github.com/icecc/icecream/commit/7ab429b5f3405ec8451c31f80573658c8818b972 -- 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-04-26 19:16 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-04-26 17:49 [ptxdist] [PATCH 1/2] m4: re-export patches with git-ptx-patches Roland Hieber 2019-04-26 17:49 ` [ptxdist] [PATCH 2/2] m4: make it build with ICECC again Roland Hieber 2019-04-26 18:42 ` Roland Hieber 2019-04-26 19:08 ` Alexander Dahl 2019-04-26 19:16 ` Roland Hieber
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox