Patchwork hiawatha: ennsure C flags are passed to builds.

login
register
mail settings
Submitter Jeffrey Honig
Date Feb. 12, 2013, 10:22 p.m.
Message ID <1360707747-8128-1-git-send-email-jeffrey.honig@windriver.com>
Download mbox | patch
Permalink /patch/44567/
State Not Applicable
Headers show

Comments

Jeffrey Honig - Feb. 12, 2013, 10:22 p.m.
[ CQID: WIND00403568 ]

Hiawatha was overriding existing C flags instead of prepending warning flags.
This caused build failures on multilibs because the C compiler could not find
the proper sysroot.

Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
---
 recipes-httpd/hiawatha/files/cmake.patch |   16 ++++++++++++++++
 recipes-httpd/hiawatha/hiawatha_8.6.bb   |    3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 recipes-httpd/hiawatha/files/cmake.patch
ml@communistcode.co.uk - Feb. 13, 2013, 10:44 a.m.
On 12/02/13 22:22, Jeffrey C Honig wrote:
> [ CQID: WIND00403568 ]
>
> Hiawatha was overriding existing C flags instead of prepending warning flags.
> This caused build failures on multilibs because the C compiler could not find
> the proper sysroot.
>
> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
> ---
>   recipes-httpd/hiawatha/files/cmake.patch |   16 ++++++++++++++++
>   recipes-httpd/hiawatha/hiawatha_8.6.bb   |    3 +++
>   2 files changed, 19 insertions(+)
>   create mode 100644 recipes-httpd/hiawatha/files/cmake.patch
>
> diff --git a/recipes-httpd/hiawatha/files/cmake.patch b/recipes-httpd/hiawatha/files/cmake.patch
> new file mode 100644
> index 0000000..f597781
> --- /dev/null
> +++ b/recipes-httpd/hiawatha/files/cmake.patch
> @@ -0,0 +1,16 @@
> +It is necessary to include the original CMAKE_C_FLAGS to insure that
> +the sysroot is passed to the compiler, instead of just setting warning
> +options.  Otherwise we'll get problem croos compiling in some
> +circumstances.
> +
> +--- a/CMakeLists.txt	2012-10-31 14:16:45.000000000 -0400
> ++++ b/CMakeLists.txt	2013-02-12 14:07:04.297058345 -0500
> +@@ -2,7 +2,7 @@
> + project(Hiawatha C)
> +
> + # Compiler
> +-set(CMAKE_C_FLAGS "-Wall -Wextra")
> ++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
> + set(CMAKE_BUILD_TYPE "RelWithDebInfo")
> +
> + # Options
> diff --git a/recipes-httpd/hiawatha/hiawatha_8.6.bb b/recipes-httpd/hiawatha/hiawatha_8.6.bb
> index 837354b..d46a525 100644
> --- a/recipes-httpd/hiawatha/hiawatha_8.6.bb
> +++ b/recipes-httpd/hiawatha/hiawatha_8.6.bb
> @@ -4,9 +4,12 @@ LICENSE = "GPLv2"
>   LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
>   DEPENDS = "libxml2 libxslt"
>   
> +PR = "r1"
> +
>   SECTION = "net"
>   
>   SRC_URI = "http://hiawatha-webserver.org/files/${BPN}-${PV}.tar.gz \
> +           file://cmake.patch \
>              file://hiawatha-init"
>   
>   SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"

What's the upstream status on this? If you email Hugo (the developer) 
directly he usually responds within a few hours and will pull the 
changes into the next release.

Regards,
Jack.
Mark Hatle - Feb. 20, 2013, 4:38 p.m.
On 2/13/13 4:44 AM, Jack Mitchell wrote:
> On 12/02/13 22:22, Jeffrey C Honig wrote:
>> [ CQID: WIND00403568 ]
>>
>> Hiawatha was overriding existing C flags instead of prepending warning flags.
>> This caused build failures on multilibs because the C compiler could not find
>> the proper sysroot.
>>
>> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
>> ---
>>    recipes-httpd/hiawatha/files/cmake.patch |   16 ++++++++++++++++
>>    recipes-httpd/hiawatha/hiawatha_8.6.bb   |    3 +++
>>    2 files changed, 19 insertions(+)
>>    create mode 100644 recipes-httpd/hiawatha/files/cmake.patch
>>
>> diff --git a/recipes-httpd/hiawatha/files/cmake.patch b/recipes-httpd/hiawatha/files/cmake.patch
>> new file mode 100644
>> index 0000000..f597781
>> --- /dev/null
>> +++ b/recipes-httpd/hiawatha/files/cmake.patch
>> @@ -0,0 +1,16 @@
>> +It is necessary to include the original CMAKE_C_FLAGS to insure that
>> +the sysroot is passed to the compiler, instead of just setting warning
>> +options.  Otherwise we'll get problem croos compiling in some
>> +circumstances.
>> +
>> +--- a/CMakeLists.txt	2012-10-31 14:16:45.000000000 -0400
>> ++++ b/CMakeLists.txt	2013-02-12 14:07:04.297058345 -0500
>> +@@ -2,7 +2,7 @@
>> + project(Hiawatha C)
>> +
>> + # Compiler
>> +-set(CMAKE_C_FLAGS "-Wall -Wextra")
>> ++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
>> + set(CMAKE_BUILD_TYPE "RelWithDebInfo")
>> +
>> + # Options
>> diff --git a/recipes-httpd/hiawatha/hiawatha_8.6.bb b/recipes-httpd/hiawatha/hiawatha_8.6.bb
>> index 837354b..d46a525 100644
>> --- a/recipes-httpd/hiawatha/hiawatha_8.6.bb
>> +++ b/recipes-httpd/hiawatha/hiawatha_8.6.bb
>> @@ -4,9 +4,12 @@ LICENSE = "GPLv2"
>>    LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
>>    DEPENDS = "libxml2 libxslt"
>>
>> +PR = "r1"
>> +
>>    SECTION = "net"
>>
>>    SRC_URI = "http://hiawatha-webserver.org/files/${BPN}-${PV}.tar.gz \
>> +           file://cmake.patch \
>>               file://hiawatha-init"
>>
>>    SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
>
> What's the upstream status on this? If you email Hugo (the developer)
> directly he usually responds within a few hours and will pull the
> changes into the next release.

I'm following up for Jeff.  He has contacted Hugo and the above patch has been 
included upstream.

--Mark

> Regards,
> Jack.
>
Paul Eggleton - Feb. 20, 2013, 4:55 p.m.
On Wednesday 20 February 2013 10:38:29 Mark Hatle wrote:
> On 2/13/13 4:44 AM, Jack Mitchell wrote:
> > On 12/02/13 22:22, Jeffrey C Honig wrote:
> >> [ CQID: WIND00403568 ]
> >> 
> >> Hiawatha was overriding existing C flags instead of prepending warning
> >> flags. This caused build failures on multilibs because the C compiler
> >> could not find the proper sysroot.
> >> 
> >> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
> >> ---
> >> 
> >>    recipes-httpd/hiawatha/files/cmake.patch |   16 ++++++++++++++++
> >>    recipes-httpd/hiawatha/hiawatha_8.6.bb   |    3 +++
> >>    2 files changed, 19 insertions(+)
> >>    create mode 100644 recipes-httpd/hiawatha/files/cmake.patch
> >> 
> >> diff --git a/recipes-httpd/hiawatha/files/cmake.patch
> >> b/recipes-httpd/hiawatha/files/cmake.patch new file mode 100644
> >> index 0000000..f597781
> >> --- /dev/null
> >> +++ b/recipes-httpd/hiawatha/files/cmake.patch
> >> @@ -0,0 +1,16 @@
> >> +It is necessary to include the original CMAKE_C_FLAGS to insure that
> >> +the sysroot is passed to the compiler, instead of just setting warning
> >> +options.  Otherwise we'll get problem croos compiling in some
> >> +circumstances.
> >> +
> >> +--- a/CMakeLists.txt	2012-10-31 14:16:45.000000000 -0400
> >> ++++ b/CMakeLists.txt	2013-02-12 14:07:04.297058345 -0500
> >> +@@ -2,7 +2,7 @@
> >> + project(Hiawatha C)
> >> +
> >> + # Compiler
> >> +-set(CMAKE_C_FLAGS "-Wall -Wextra")
> >> ++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
> >> + set(CMAKE_BUILD_TYPE "RelWithDebInfo")
> >> +
> >> + # Options
> >> diff --git a/recipes-httpd/hiawatha/hiawatha_8.6.bb
> >> b/recipes-httpd/hiawatha/hiawatha_8.6.bb index 837354b..d46a525 100644
> >> --- a/recipes-httpd/hiawatha/hiawatha_8.6.bb
> >> +++ b/recipes-httpd/hiawatha/hiawatha_8.6.bb
> >> @@ -4,9 +4,12 @@ LICENSE = "GPLv2"
> >> 
> >>    LIC_FILES_CHKSUM =
> >>    "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
> >>    DEPENDS = "libxml2 libxslt"
> >> 
> >> +PR = "r1"
> >> +
> >> 
> >>    SECTION = "net"
> >>    
> >>    SRC_URI = "http://hiawatha-webserver.org/files/${BPN}-${PV}.tar.gz \
> >> 
> >> +           file://cmake.patch \
> >> 
> >>               file://hiawatha-init"
> >>    
> >>    SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
> > 
> > What's the upstream status on this? If you email Hugo (the developer)
> > directly he usually responds within a few hours and will pull the
> > changes into the next release.
> 
> I'm following up for Jeff.  He has contacted Hugo and the above patch has
> been included upstream.

Great. Should I still apply this to meta-webserver then or do we wait for a 
new upstream release?

Cheers,
Paul
Jeffrey Honig - Feb. 20, 2013, 6:19 p.m.
Paul Eggleton <paul.eggleton@linux.intel.com> wrote:

> On Wednesday 20 February 2013 10:38:29 Mark Hatle wrote:
> > On 2/13/13 4:44 AM, Jack Mitchell wrote:
> > > On 12/02/13 22:22, Jeffrey C Honig wrote:
> > >> [ CQID: WIND00403568 ]
> > >> 
> > >> Hiawatha was overriding existing C flags instead of prepending warning
> > >> flags. This caused build failures on multilibs because the C compiler
> > >> could not find the proper sysroot.
> > >> 
> > >> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
> > >> ---
> > >> 
> > >>    recipes-httpd/hiawatha/files/cmake.patch |   16 ++++++++++++++++
> > >>    recipes-httpd/hiawatha/hiawatha_8.6.bb   |    3 +++
> > >>    2 files changed, 19 insertions(+)
> > >>    create mode 100644 recipes-httpd/hiawatha/files/cmake.patch
> > >> 
> > >> diff --git a/recipes-httpd/hiawatha/files/cmake.patch
> > >> b/recipes-httpd/hiawatha/files/cmake.patch new file mode 100644
> > >> index 0000000..f597781
> > >> --- /dev/null
> > >> +++ b/recipes-httpd/hiawatha/files/cmake.patch
> > >> @@ -0,0 +1,16 @@
> > >> +It is necessary to include the original CMAKE_C_FLAGS to insure that
> > >> +the sysroot is passed to the compiler, instead of just setting warning
> > >> +options.  Otherwise we'll get problem croos compiling in some
> > >> +circumstances.
> > >> +
> > >> +--- a/CMakeLists.txt	2012-10-31 14:16:45.000000000 -0400
> > >> ++++ b/CMakeLists.txt	2013-02-12 14:07:04.297058345 -0500
> > >> +@@ -2,7 +2,7 @@
> > >> + project(Hiawatha C)
> > >> +
> > >> + # Compiler
> > >> +-set(CMAKE_C_FLAGS "-Wall -Wextra")
> > >> ++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
> > >> + set(CMAKE_BUILD_TYPE "RelWithDebInfo")
> > >> +
> > >> + # Options
> > >> diff --git a/recipes-httpd/hiawatha/hiawatha_8.6.bb
> > >> b/recipes-httpd/hiawatha/hiawatha_8.6.bb index 837354b..d46a525 100644
> > >> --- a/recipes-httpd/hiawatha/hiawatha_8.6.bb
> > >> +++ b/recipes-httpd/hiawatha/hiawatha_8.6.bb
> > >> @@ -4,9 +4,12 @@ LICENSE = "GPLv2"
> > >> 
> > >>    LIC_FILES_CHKSUM =
> > >>    "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
> > >>    DEPENDS = "libxml2 libxslt"
> > >> 
> > >> +PR = "r1"
> > >> +
> > >> 
> > >>    SECTION = "net"
> > >>    
> > >>    SRC_URI = "http://hiawatha-webserver.org/files/${BPN}-${PV}.tar.gz \
> > >> 
> > >> +           file://cmake.patch \
> > >> 
> > >>               file://hiawatha-init"
> > >>    
> > >>    SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
> > > 
> > > What's the upstream status on this? If you email Hugo (the developer)
> > > directly he usually responds within a few hours and will pull the
> > > changes into the next release.
> > 
> > I'm following up for Jeff.  He has contacted Hugo and the above patch has
> > been included upstream.
> 
> Great. Should I still apply this to meta-webserver then or do we wait for a 
> new upstream release?

We have a local patch applied, we are good.  It is fine to wait.

Thanks!

Jeff
ml@communistcode.co.uk - Feb. 26, 2013, 4:05 p.m.
On 20/02/13 18:19, Jeffrey Honig wrote:
> Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
>
>> On Wednesday 20 February 2013 10:38:29 Mark Hatle wrote:
>>> On 2/13/13 4:44 AM, Jack Mitchell wrote:
>>>> On 12/02/13 22:22, Jeffrey C Honig wrote:
>>>>> [ CQID: WIND00403568 ]
>>>>>
>>>>> Hiawatha was overriding existing C flags instead of prepending warning
>>>>> flags. This caused build failures on multilibs because the C compiler
>>>>> could not find the proper sysroot.
>>>>>
>>>>> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
>>>>> ---
>>>>>
>>>>>     recipes-httpd/hiawatha/files/cmake.patch |   16 ++++++++++++++++
>>>>>     recipes-httpd/hiawatha/hiawatha_8.6.bb   |    3 +++
>>>>>     2 files changed, 19 insertions(+)
>>>>>     create mode 100644 recipes-httpd/hiawatha/files/cmake.patch
>>>>>
>>>>> diff --git a/recipes-httpd/hiawatha/files/cmake.patch
>>>>> b/recipes-httpd/hiawatha/files/cmake.patch new file mode 100644
>>>>> index 0000000..f597781
>>>>> --- /dev/null
>>>>> +++ b/recipes-httpd/hiawatha/files/cmake.patch
>>>>> @@ -0,0 +1,16 @@
>>>>> +It is necessary to include the original CMAKE_C_FLAGS to insure that
>>>>> +the sysroot is passed to the compiler, instead of just setting warning
>>>>> +options.  Otherwise we'll get problem croos compiling in some
>>>>> +circumstances.
>>>>> +
>>>>> +--- a/CMakeLists.txt	2012-10-31 14:16:45.000000000 -0400
>>>>> ++++ b/CMakeLists.txt	2013-02-12 14:07:04.297058345 -0500
>>>>> +@@ -2,7 +2,7 @@
>>>>> + project(Hiawatha C)
>>>>> +
>>>>> + # Compiler
>>>>> +-set(CMAKE_C_FLAGS "-Wall -Wextra")
>>>>> ++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
>>>>> + set(CMAKE_BUILD_TYPE "RelWithDebInfo")
>>>>> +
>>>>> + # Options
>>>>> diff --git a/recipes-httpd/hiawatha/hiawatha_8.6.bb
>>>>> b/recipes-httpd/hiawatha/hiawatha_8.6.bb index 837354b..d46a525 100644
>>>>> --- a/recipes-httpd/hiawatha/hiawatha_8.6.bb
>>>>> +++ b/recipes-httpd/hiawatha/hiawatha_8.6.bb
>>>>> @@ -4,9 +4,12 @@ LICENSE = "GPLv2"
>>>>>
>>>>>     LIC_FILES_CHKSUM =
>>>>>     "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
>>>>>     DEPENDS = "libxml2 libxslt"
>>>>>
>>>>> +PR = "r1"
>>>>> +
>>>>>
>>>>>     SECTION = "net"
>>>>>     
>>>>>     SRC_URI = "http://hiawatha-webserver.org/files/${BPN}-${PV}.tar.gz \
>>>>>
>>>>> +           file://cmake.patch \
>>>>>
>>>>>                file://hiawatha-init"
>>>>>     
>>>>>     SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
>>>> What's the upstream status on this? If you email Hugo (the developer)
>>>> directly he usually responds within a few hours and will pull the
>>>> changes into the next release.
>>> I'm following up for Jeff.  He has contacted Hugo and the above patch has
>>> been included upstream.
>> Great. Should I still apply this to meta-webserver then or do we wait for a
>> new upstream release?
> We have a local patch applied, we are good.  It is fine to wait.
>
> Thanks!
>
> Jeff
>

8.8 has been released if someone wants to pick this up. I would myself 
but I'm currently blocked by a binutils failure.
Khem Raj - Feb. 26, 2013, 5:42 p.m.
> 
> 8.8 has been released if someone wants to pick this up. I would
> myself but I'm currently blocked by a binutils failure.

whats the binutils failure ? have you reported it somewhere ?
ml@communistcode.co.uk - Feb. 26, 2013, 6:35 p.m.
On 26/02/2013 17:42, Khem Raj wrote:
>> 8.8 has been released if someone wants to pick this up. I would
>> myself but I'm currently blocked by a binutils failure.
> whats the binutils failure ? have you reported it somewhere ?
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

http://article.gmane.org/gmane.comp.handhelds.openembedded.core/33812/match=jack+mitchell

and

https://bugzilla.yoctoproject.org/show_bug.cgi?id=3943

Cheers,
Khem Raj - Feb. 26, 2013, 8:58 p.m.
On Tue, Feb 26, 2013 at 10:35 AM, Jack Mitchell <ml@communistcode.co.uk> wrote:
> On 26/02/2013 17:42, Khem Raj wrote:
>>>
>>> 8.8 has been released if someone wants to pick this up. I would
>>> myself but I'm currently blocked by a binutils failure.
>>
>> whats the binutils failure ? have you reported it somewhere ?
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
> http://article.gmane.org/gmane.comp.handhelds.openembedded.core/33812/match=jack+mitchell
>

thats not so much related here but I guess texinfo got updated

> and
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=3943
>


I have posted a fix for it. here

http://patchwork.openembedded.org/patch/45151/

please try it out and report back


> Cheers,
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes-httpd/hiawatha/files/cmake.patch b/recipes-httpd/hiawatha/files/cmake.patch
new file mode 100644
index 0000000..f597781
--- /dev/null
+++ b/recipes-httpd/hiawatha/files/cmake.patch
@@ -0,0 +1,16 @@ 
+It is necessary to include the original CMAKE_C_FLAGS to insure that
+the sysroot is passed to the compiler, instead of just setting warning
+options.  Otherwise we'll get problem croos compiling in some
+circumstances.
+
+--- a/CMakeLists.txt	2012-10-31 14:16:45.000000000 -0400
++++ b/CMakeLists.txt	2013-02-12 14:07:04.297058345 -0500
+@@ -2,7 +2,7 @@
+ project(Hiawatha C)
+ 
+ # Compiler
+-set(CMAKE_C_FLAGS "-Wall -Wextra")
++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}")
+ set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+ 
+ # Options
diff --git a/recipes-httpd/hiawatha/hiawatha_8.6.bb b/recipes-httpd/hiawatha/hiawatha_8.6.bb
index 837354b..d46a525 100644
--- a/recipes-httpd/hiawatha/hiawatha_8.6.bb
+++ b/recipes-httpd/hiawatha/hiawatha_8.6.bb
@@ -4,9 +4,12 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "libxml2 libxslt"
 
+PR = "r1"
+
 SECTION = "net"
 
 SRC_URI = "http://hiawatha-webserver.org/files/${BPN}-${PV}.tar.gz \
+           file://cmake.patch \
            file://hiawatha-init"
 
 SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"