Re: [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* Re: [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl
       [not found] <mailman.3672.1635273538.103149.buildroot@buildroot.org>
@ 2021-10-27  4:58 ` Andreas Ziegler
  2021-10-27  7:27   ` Fabrice Fontaine
  0 siblings, 1 reply; 5+ messages in thread
From: Andreas Ziegler @ 2021-10-27  4:58 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Matt Weber, buildroot

Hi Fabrice,

On 2021-10-26 18:38, Fabrice Fontaine <fontaine.fabrice@gmail.com> 
wrote:

> Fix the following build failure on musl raised since bump to version
> 1.4.60 in commit d62b7f54f00291a50274409fb5510527fd725ffe:
> 
> In file included from buffer.h:404,
>                  from array.h:5,
>                  from array.c:3:
> ck.h:24:14: error: expected ';' before 'typedef'
>    24 | __BEGIN_DECLS
>       |              ^
>       |              ;
> ......
>    29 | typedef size_t rsize_t;
>       | ~~~~~~~
> 
> Fixes:
>  -
> http://autobuild.buildroot.org/results/0d56a44449e89773499051b35f21ec83bfab4ca6
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...-__BEGIN_DECLS-__END_DECLS-if-needed.patch | 39 +++++++++++++++++++
>  1 file changed, 39 insertions(+)
>  create mode 100644
> package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> 
> diff --git
> a/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> new file mode 100644
> index 0000000000..cd64f18794
> --- /dev/null
> +++
> b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> @@ -0,0 +1,39 @@
> +From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001
> +From: Glenn Strauss <gstrauss@gluelogic.com>
> +Date: Mon, 4 Oct 2021 09:51:22 -0400
> +Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed
> +
> +[Retrieved from:
> +https://github.com/lighttpd/lighttpd1.4/commit/cf4dfbe15ef8ead3a7eda974af7d804d447f00db]
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +---
> + src/first.h | 16 ++++++++++++++++
> + 1 file changed, 16 insertions(+)
> +
> +diff --git a/src/first.h b/src/first.h
> +index df747ba46..9d0428ae6 100644
> +--- a/src/first.h
> ++++ b/src/first.h
> +@@ -39,6 +39,22 @@
> + #include <sys/types.h>
> + #include <stddef.h>
> +
> ++#ifndef __BEGIN_DECLS
> ++#ifdef __cplusplus
> ++#define __BEGIN_DECLS extern "C" {
> ++#else
> ++#define __BEGIN_DECLS
> ++#endif
> ++#endif

Instead of creating your own declarations of _*_DECLS, you might just 
add the missing <sys/cdefs.h> to ck.h; this seems to be the only place 
the problem occurs.

The header is part of glibc, but not of musl; within Buildroot it is 
automatically added by musl-compat-headers, which is selected if you use 
musl.

Kind regards,
Andreas

> ++
> ++#ifndef __END_DECLS
> ++#ifdef __cplusplus
> ++#define __END_DECLS }
> ++#else
> ++#define __END_DECLS
> ++#endif
> ++#endif
> ++
> + #if defined HAVE_STDINT_H
> + # include <stdint.h>
> + #elif defined HAVE_INTTYPES_H
> --
> 2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl
  2021-10-27  4:58 ` [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl Andreas Ziegler
@ 2021-10-27  7:27   ` Fabrice Fontaine
  2021-10-27  9:36     ` Andreas Ziegler
  0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2021-10-27  7:27 UTC (permalink / raw)
  To: Andreas Ziegler; +Cc: Matt Weber, Buildroot Mailing List

Hi Andreas,

Le mer. 27 oct. 2021 à 06:58, Andreas Ziegler <br015@umbiko.net> a écrit :
>
> Hi Fabrice,
>
> On 2021-10-26 18:38, Fabrice Fontaine <fontaine.fabrice@gmail.com>
> wrote:
>
> > Fix the following build failure on musl raised since bump to version
> > 1.4.60 in commit d62b7f54f00291a50274409fb5510527fd725ffe:
> >
> > In file included from buffer.h:404,
> >                  from array.h:5,
> >                  from array.c:3:
> > ck.h:24:14: error: expected ';' before 'typedef'
> >    24 | __BEGIN_DECLS
> >       |              ^
> >       |              ;
> > ......
> >    29 | typedef size_t rsize_t;
> >       | ~~~~~~~
> >
> > Fixes:
> >  -
> > http://autobuild.buildroot.org/results/0d56a44449e89773499051b35f21ec83bfab4ca6
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  ...-__BEGIN_DECLS-__END_DECLS-if-needed.patch | 39 +++++++++++++++++++
> >  1 file changed, 39 insertions(+)
> >  create mode 100644
> > package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> >
> > diff --git
> > a/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> > b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> > new file mode 100644
> > index 0000000000..cd64f18794
> > --- /dev/null
> > +++
> > b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
> > @@ -0,0 +1,39 @@
> > +From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001
> > +From: Glenn Strauss <gstrauss@gluelogic.com>
> > +Date: Mon, 4 Oct 2021 09:51:22 -0400
> > +Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed
> > +
> > +[Retrieved from:
> > +https://github.com/lighttpd/lighttpd1.4/commit/cf4dfbe15ef8ead3a7eda974af7d804d447f00db]
> > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > +---
> > + src/first.h | 16 ++++++++++++++++
> > + 1 file changed, 16 insertions(+)
> > +
> > +diff --git a/src/first.h b/src/first.h
> > +index df747ba46..9d0428ae6 100644
> > +--- a/src/first.h
> > ++++ b/src/first.h
> > +@@ -39,6 +39,22 @@
> > + #include <sys/types.h>
> > + #include <stddef.h>
> > +
> > ++#ifndef __BEGIN_DECLS
> > ++#ifdef __cplusplus
> > ++#define __BEGIN_DECLS extern "C" {
> > ++#else
> > ++#define __BEGIN_DECLS
> > ++#endif
> > ++#endif
>
> Instead of creating your own declarations of _*_DECLS, you might just
> add the missing <sys/cdefs.h> to ck.h; this seems to be the only place
> the problem occurs.
>
> The header is part of glibc, but not of musl; within Buildroot it is
> automatically added by musl-compat-headers, which is selected if you use
> musl.
This is an upstream patch and I don't know if they will accept to
replace it with your proposal even if it seems better.
Feel free to send a PR to https://github.com/lighttpd/lighttpd1.4 and
a v2 of this patch.
>
> Kind regards,
> Andreas
>
> > ++
> > ++#ifndef __END_DECLS
> > ++#ifdef __cplusplus
> > ++#define __END_DECLS }
> > ++#else
> > ++#define __END_DECLS
> > ++#endif
> > ++#endif
> > ++
> > + #if defined HAVE_STDINT_H
> > + # include <stdint.h>
> > + #elif defined HAVE_INTTYPES_H
> > --
> > 2.33.0
Best Regards,

Fabrice
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl
  2021-10-27  7:27   ` Fabrice Fontaine
@ 2021-10-27  9:36     ` Andreas Ziegler
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Ziegler @ 2021-10-27  9:36 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Matt Weber, Buildroot Mailing List

Hi Fabrice,

On 2021-10-27 07:27, Fabrice Fontaine wrote:
> Hi Andreas,
> 
> Le mer. 27 oct. 2021 à 06:58, Andreas Ziegler <br015@umbiko.net> a 
> écrit :
>> 
>> Hi Fabrice,
>> 
>> On 2021-10-26 18:38, Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> wrote:
>> 
>> > Fix the following build failure on musl raised since bump to version
>> > 1.4.60 in commit d62b7f54f00291a50274409fb5510527fd725ffe:
>> >
>> > In file included from buffer.h:404,
>> >                  from array.h:5,
>> >                  from array.c:3:
>> > ck.h:24:14: error: expected ';' before 'typedef'
>> >    24 | __BEGIN_DECLS
>> >       |              ^
>> >       |              ;
>> > ......
>> >    29 | typedef size_t rsize_t;
>> >       | ~~~~~~~
>> >
>> > Fixes:
>> >  -
>> > http://autobuild.buildroot.org/results/0d56a44449e89773499051b35f21ec83bfab4ca6
>> >
>> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> > ---
>> >  ...-__BEGIN_DECLS-__END_DECLS-if-needed.patch | 39 +++++++++++++++++++
>> >  1 file changed, 39 insertions(+)
>> >  create mode 100644
>> > package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
>> >
>> > diff --git
>> > a/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
>> > b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
>> > new file mode 100644
>> > index 0000000000..cd64f18794
>> > --- /dev/null
>> > +++
>> > b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
>> > @@ -0,0 +1,39 @@
>> > +From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001
>> > +From: Glenn Strauss <gstrauss@gluelogic.com>
>> > +Date: Mon, 4 Oct 2021 09:51:22 -0400
>> > +Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed
>> > +
>> > +[Retrieved from:
>> > +https://github.com/lighttpd/lighttpd1.4/commit/cf4dfbe15ef8ead3a7eda974af7d804d447f00db]
>> > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> > +---
>> > + src/first.h | 16 ++++++++++++++++
>> > + 1 file changed, 16 insertions(+)
>> > +
>> > +diff --git a/src/first.h b/src/first.h
>> > +index df747ba46..9d0428ae6 100644
>> > +--- a/src/first.h
>> > ++++ b/src/first.h
>> > +@@ -39,6 +39,22 @@
>> > + #include <sys/types.h>
>> > + #include <stddef.h>
>> > +
>> > ++#ifndef __BEGIN_DECLS
>> > ++#ifdef __cplusplus
>> > ++#define __BEGIN_DECLS extern "C" {
>> > ++#else
>> > ++#define __BEGIN_DECLS
>> > ++#endif
>> > ++#endif
>> 
>> Instead of creating your own declarations of _*_DECLS, you might just
>> add the missing <sys/cdefs.h> to ck.h; this seems to be the only place
>> the problem occurs.
>> 
>> The header is part of glibc, but not of musl; within Buildroot it is
>> automatically added by musl-compat-headers, which is selected if you 
>> use
>> musl.
> This is an upstream patch and I don't know if they will accept to
> replace it with your proposal even if it seems better.
> Feel free to send a PR to https://github.com/lighttpd/lighttpd1.4 and
> a v2 of this patch.

No, probably not. My idea is highly Buildroot specific and will not work 
outside of this environment. Since the change will be incorporated in 
the next lighttpd release anyway, I withdraw any objections.

Tested-by: Andreas Ziegler <br015@umbiko.net>

>> 
>> Kind regards,
>> Andreas
>> 
>> > ++
>> > ++#ifndef __END_DECLS
>> > ++#ifdef __cplusplus
>> > ++#define __END_DECLS }
>> > ++#else
>> > ++#define __END_DECLS
>> > ++#endif
>> > ++#endif
>> > ++
>> > + #if defined HAVE_STDINT_H
>> > + # include <stdint.h>
>> > + #elif defined HAVE_INTTYPES_H
>> > --
>> > 2.33.0
> Best Regards,
> 
> Fabrice

Kind regards,
Andreas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl
@ 2021-10-26 16:45 Fabrice Fontaine
  2021-11-05 16:14 ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2021-10-26 16:45 UTC (permalink / raw)
  To: buildroot; +Cc: Matt Weber, Fabrice Fontaine

Fix the following build failure on musl raised since bump to version
1.4.60 in commit d62b7f54f00291a50274409fb5510527fd725ffe:

In file included from buffer.h:404,
                 from array.h:5,
                 from array.c:3:
ck.h:24:14: error: expected ';' before 'typedef'
   24 | __BEGIN_DECLS
      |              ^
      |              ;
......
   29 | typedef size_t rsize_t;
      | ~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/0d56a44449e89773499051b35f21ec83bfab4ca6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-__BEGIN_DECLS-__END_DECLS-if-needed.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch

diff --git a/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
new file mode 100644
index 0000000000..cd64f18794
--- /dev/null
+++ b/package/lighttpd/0002-core-define-__BEGIN_DECLS-__END_DECLS-if-needed.patch
@@ -0,0 +1,39 @@
+From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Mon, 4 Oct 2021 09:51:22 -0400
+Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed
+
+[Retrieved from:
+https://github.com/lighttpd/lighttpd1.4/commit/cf4dfbe15ef8ead3a7eda974af7d804d447f00db]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/first.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/first.h b/src/first.h
+index df747ba46..9d0428ae6 100644
+--- a/src/first.h
++++ b/src/first.h
+@@ -39,6 +39,22 @@
+ #include <sys/types.h>
+ #include <stddef.h>
+ 
++#ifndef __BEGIN_DECLS
++#ifdef __cplusplus
++#define __BEGIN_DECLS extern "C" {
++#else
++#define __BEGIN_DECLS
++#endif
++#endif
++
++#ifndef __END_DECLS
++#ifdef __cplusplus
++#define __END_DECLS }
++#else
++#define __END_DECLS
++#endif
++#endif
++
+ #if defined HAVE_STDINT_H
+ # include <stdint.h>
+ #elif defined HAVE_INTTYPES_H
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl
  2021-10-26 16:45 Fabrice Fontaine
@ 2021-11-05 16:14 ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2021-11-05 16:14 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Matt Weber, buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure on musl raised since bump to version
 > 1.4.60 in commit d62b7f54f00291a50274409fb5510527fd725ffe:

 > In file included from buffer.h:404,
 >                  from array.h:5,
 >                  from array.c:3:
 > ck.h:24:14: error: expected ';' before 'typedef'
 >    24 | __BEGIN_DECLS
 >       |              ^
 >       |              ;
 > ......
 >    29 | typedef size_t rsize_t;
 >       | ~~~~~~~

 > Fixes:
 >  - http://autobuild.buildroot.org/results/0d56a44449e89773499051b35f21ec83bfab4ca6

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

I was going to apply this, but it seems like it is in 1.4.61 already, so I
have marked it as superseeded in patchwork.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-11-05 16:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <mailman.3672.1635273538.103149.buildroot@buildroot.org>
2021-10-27  4:58 ` [Buildroot] [PATCH 1/1] package/lighttpd: fix build on musl Andreas Ziegler
2021-10-27  7:27   ` Fabrice Fontaine
2021-10-27  9:36     ` Andreas Ziegler
2021-10-26 16:45 Fabrice Fontaine
2021-11-05 16:14 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox