Patchwork cmake: forward HOST_{C, LD}FLAGS as cmake flags

login
register
mail settings
Submitter Samuel Martin
Date May 8, 2014, 9:58 p.m.
Message ID <1399586335-22928-1-git-send-email-s.martin49@gmail.com>
Download mbox | patch
Permalink /patch/347260/
State Superseded
Headers show

Comments

Samuel Martin - May 8, 2014, 9:58 p.m.
During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap
environment are not forwarded/converted as CMake flags.

The CMake build contains a bootstrap phase building a minimal CMake
program using a standard Makfile, then reconfigures itself with this
minimal program.

On system with no ncurses installed, and because the prefix option
points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses,
then ncurses libraries and headers are correctly find (in the host tree)
during the second configuration (because of the prefix). However, it
fails at building ccmake (the curses interface) because the
CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not
point to the host tree.

Because these flags are needed when running the bootstrap script,
this patch makes sure the same flags are set when running the second
configuration.

Reported-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
---
 package/cmake/cmake.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Fabio Porcedda - May 9, 2014, 8:01 a.m.
On Thu, May 8, 2014 at 11:58 PM, Samuel Martin <s.martin49@gmail.com> wrote:
> During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap
> environment are not forwarded/converted as CMake flags.
>
> The CMake build contains a bootstrap phase building a minimal CMake
> program using a standard Makfile, then reconfigures itself with this
> minimal program.
>
> On system with no ncurses installed, and because the prefix option
> points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses,
> then ncurses libraries and headers are correctly find (in the host tree)
> during the second configuration (because of the prefix). However, it
> fails at building ccmake (the curses interface) because the
> CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not
> point to the host tree.
>
> Because these flags are needed when running the bootstrap script,
> this patch makes sure the same flags are set when running the second
> configuration.
>
> Reported-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
> Cc: Luca Ceresoli <luca@lucaceresoli.net>
> ---
>  package/cmake/cmake.mk | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
> index d45c642..1240895 100644
> --- a/package/cmake/cmake.mk
> +++ b/package/cmake/cmake.mk
> @@ -14,7 +14,9 @@ define HOST_CMAKE_CONFIGURE_CMDS
>         (cd $(@D); \
>                 LDFLAGS="$(HOST_LDFLAGS)" \
>                 CFLAGS="$(HOST_CFLAGS)" \
> -               ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
> +               ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) -- \
> +               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" -DCMAKE_CXX_FLAGS="$(HOST_CFLAGS)" \

I think HOST_CXXFLAGS must be used:

 -               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)"
-DCMAKE_CXX_FLAGS="$(HOST_CFLAGS)" \
+               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)"
-DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \

> +               -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
>         )
>  endef
>
> --
> 1.9.2
>

Regards
Luca Ceresoli - May 9, 2014, 8:27 a.m.
Hi Samuel,

Samuel Martin wrote:
> During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap
> environment are not forwarded/converted as CMake flags.
>
> The CMake build contains a bootstrap phase building a minimal CMake
> program using a standard Makfile, then reconfigures itself with this
> minimal program.
>
> On system with no ncurses installed, and because the prefix option
> points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses,
> then ncurses libraries and headers are correctly find (in the host tree)

s/find/found/.

> during the second configuration (because of the prefix). However, it
> fails at building ccmake (the curses interface) because the
> CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not
> point to the host tree.
>
> Because these flags are needed when running the bootstrap script,
> this patch makes sure the same flags are set when running the second
> configuration.
>
> Reported-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
> Cc: Luca Ceresoli <luca@lucaceresoli.net>

In general I'm OK with this fix once it is, well... fixed according to
Fabio's comment.

But I still think disabling ccmake and other host tools that Buildroot
does not use would be a good idea. I agree with Thomas when he says
building host-cmake takes really long, although I am not sure we can
save a lot of time.

So I'd proceed quickly with this fix, and later disable unneeded tools
and see how much time we can save.
Fabio Porcedda - May 9, 2014, 8:33 a.m.
On Fri, May 9, 2014 at 10:27 AM, Luca Ceresoli <luca@lucaceresoli.net> wrote:
> Hi Samuel,
>
>
> Samuel Martin wrote:
>>
>> During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap
>> environment are not forwarded/converted as CMake flags.
>>
>> The CMake build contains a bootstrap phase building a minimal CMake
>> program using a standard Makfile, then reconfigures itself with this
>> minimal program.
>>
>> On system with no ncurses installed, and because the prefix option
>> points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses,
>> then ncurses libraries and headers are correctly find (in the host tree)
>
>
> s/find/found/.
>
>
>> during the second configuration (because of the prefix). However, it
>> fails at building ccmake (the curses interface) because the
>> CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not
>> point to the host tree.
>>
>> Because these flags are needed when running the bootstrap script,
>> this patch makes sure the same flags are set when running the second
>> configuration.
>>
>> Reported-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
>> Cc: Luca Ceresoli <luca@lucaceresoli.net>
>
>
> In general I'm OK with this fix once it is, well... fixed according to
> Fabio's comment.
>
> But I still think disabling ccmake and other host tools that Buildroot
> does not use would be a good idea. I agree with Thomas when he says
> building host-cmake takes really long, although I am not sure we can
> save a lot of time.
>
> So I'd proceed quickly with this fix, and later disable unneeded tools
> and see how much time we can save.

I think the same so after the revision of this patch  is sent i will
sent a revision of my patch rebased on this one.
That is also useful to remove a optionally unspecified dependency for
the sake of reproducible builds.

Samuel could you also break lines longer than 80 characters?

Thanks
Samuel Martin - May 9, 2014, 8:57 a.m.
On Fri, May 9, 2014 at 10:01 AM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> On Thu, May 8, 2014 at 11:58 PM, Samuel Martin <s.martin49@gmail.com> wrote:
>> During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap
>> environment are not forwarded/converted as CMake flags.
>>
>> The CMake build contains a bootstrap phase building a minimal CMake
>> program using a standard Makfile, then reconfigures itself with this
>> minimal program.
>>
>> On system with no ncurses installed, and because the prefix option
>> points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses,
>> then ncurses libraries and headers are correctly find (in the host tree)
>> during the second configuration (because of the prefix). However, it
>> fails at building ccmake (the curses interface) because the
>> CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not
>> point to the host tree.
>>
>> Because these flags are needed when running the bootstrap script,
>> this patch makes sure the same flags are set when running the second
>> configuration.
>>
>> Reported-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
>> Cc: Luca Ceresoli <luca@lucaceresoli.net>
>> ---
>>  package/cmake/cmake.mk | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
>> index d45c642..1240895 100644
>> --- a/package/cmake/cmake.mk
>> +++ b/package/cmake/cmake.mk
>> @@ -14,7 +14,9 @@ define HOST_CMAKE_CONFIGURE_CMDS
>>         (cd $(@D); \
>>                 LDFLAGS="$(HOST_LDFLAGS)" \
>>                 CFLAGS="$(HOST_CFLAGS)" \
>> -               ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
>> +               ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) -- \
>> +               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" -DCMAKE_CXX_FLAGS="$(HOST_CFLAGS)" \
>
> I think HOST_CXXFLAGS must be used:
>
>  -               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)"
> -DCMAKE_CXX_FLAGS="$(HOST_CFLAGS)" \
> +               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)"
> -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \

Indeed, even if HOST_CXXFLAGS = $(HOST_CFLAGS) in buildroot ;-)
Will do.

>
>> +               -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
>>         )
>>  endef
>>
>> --
>> 1.9.2
>>
>
> Regards
> --
> Fabio Porcedda

Regards,
Samuel Martin - May 9, 2014, 9:03 a.m.
On Fri, May 9, 2014 at 10:33 AM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> On Fri, May 9, 2014 at 10:27 AM, Luca Ceresoli <luca@lucaceresoli.net> wrote:
>> Hi Samuel,
>>
>>
>> Samuel Martin wrote:
>>>
>>> During the CMake bootstrap phase, the {C,LD}FLAGS set in the bootstrap
>>> environment are not forwarded/converted as CMake flags.
>>>
>>> The CMake build contains a bootstrap phase building a minimal CMake
>>> program using a standard Makfile, then reconfigures itself with this
>>> minimal program.
>>>
>>> On system with no ncurses installed, and because the prefix option
>>> points to $(HOST_DIR)/usr, if host-cmake was built after host-ncurses,
>>> then ncurses libraries and headers are correctly find (in the host tree)
>>
>>
>> s/find/found/.

good catch!

>>
>>
>>> during the second configuration (because of the prefix). However, it
>>> fails at building ccmake (the curses interface) because the
>>> CMAKE_C_FLAGS, CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS do not
>>> point to the host tree.
>>>
>>> Because these flags are needed when running the bootstrap script,
>>> this patch makes sure the same flags are set when running the second
>>> configuration.
>>>
>>> Reported-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>>> Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
>>> Cc: Luca Ceresoli <luca@lucaceresoli.net>
>>
>>
>> In general I'm OK with this fix once it is, well... fixed according to
>> Fabio's comment.
>>
>> But I still think disabling ccmake and other host tools that Buildroot
>> does not use would be a good idea. I agree with Thomas when he says
>> building host-cmake takes really long, although I am not sure we can
>> save a lot of time.
>>
>> So I'd proceed quickly with this fix, and later disable unneeded tools
>> and see how much time we can save.
>
> I think the same so after the revision of this patch  is sent i will
> sent a revision of my patch rebased on this one.
> That is also useful to remove a optionally unspecified dependency for
> the sake of reproducible builds.
>

Sure, do it! :-)

> Samuel could you also break lines longer than 80 characters?

Will do.

>
> Thanks
> --
> Fabio Porcedda

Regards,

Patch

diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index d45c642..1240895 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -14,7 +14,9 @@  define HOST_CMAKE_CONFIGURE_CMDS
 	(cd $(@D); \
 		LDFLAGS="$(HOST_LDFLAGS)" \
 		CFLAGS="$(HOST_CFLAGS)" \
-		./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) \
+		./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(PARALLEL_JOBS) -- \
+		-DCMAKE_C_FLAGS="$(HOST_CFLAGS)" -DCMAKE_CXX_FLAGS="$(HOST_CFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
 	)
 endef