cmake: don't use any header available in $(HOST_DIR)/usr/include
PATCH v4 1/1 cmake: don't use any header available in $(HOST_DIR)/usr/include
The -I<dir> options added to CMAKE_C_FLAGS are passed to the compiler before the -I<dir> options of the cmake internal headers, so when the host-xz package was already built, a #include <lzma.h> directive loads the host-xz header instead of the cmake internal one.
Because we don't want to use any header avaiable in -I$(HOST_DIR)/usr/include, just get rid of the -I<dir> options in the HOST_CFLAGS.
Fix build failure:
make host-xz host-cmake
.../output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:17:1: error: conflicting types for ?lzma_block_buffer_decode?
lzma_block_buffer_decode(lzma_block *block, lzma_allocator *allocator,
^
In file included from /home/tetsuya/buildroot/br2/output/host/usr/include/lzma.h:296:0,
from /home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/common.h:34, from /home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_decoder.h:16, from /home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:13:/home/tetsuya/buildroot/br2/output/host/usr/include/lzma/block.h:577:27: note: previous declaration of ?lzma_block_buffer_decode? was here
extern LZMA_API(lzma_ret) lzma_block_buffer_decode(
^
Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/build.make:261: recipe for target 'Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o' failed make[3]: *** [Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o] Error 1
Fixes:
http://autobuild.buildroot.org/results/4edf6e169dc4a00d8a8bd16a86eba2316cbbd9e5
http://autobuild.buildroot.org/results/a9ff38b22a36a2f8427d33085d3263a8cbfbd746
http://autobuild.buildroot.org/results/ecaa0227249207b5450519832a193c1585ac8177
---
Notes:
v4:
- Use sed instead of filter-out (Thomas P.)
- Add to the message the steps to reproduce the build failure
v3:
- Use filter-out instead of sed (Baruch)
v2:
- Instead of tring to use the system lzma library when avaiable, just always use the internal one (Thomas P.).
package/cmake/cmake.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
package/cmake/cmake.mk +8 -2
@@ -12,13 +12,19 @@ CMAKE_LICENSE_FILES = Copyright.txt HOST_CMAKE_DEPENDENCIES = host-pkgconf +# Get rid of -I* options to prevent that a header avaiable in +# $(HOST_DIR)/usr/include is used instead of a cmake one, e.g. lzma* +# headers of the xz package +HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | \ + sed -r "s/(^|[[:space:]]+)-I[[:space:]]*[^[:space:]]*//") + define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ LDFLAGS="$(HOST_LDFLAGS)" \ - CFLAGS="$(HOST_CFLAGS)" \ + CFLAGS="$(HOST_CMAKE_CFLAGS)" \ ./bootstrap --prefix=$(HOST_DIR)/usr \ --parallel=$(PARALLEL_JOBS) -- \ - -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ + -DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ -DBUILD_CursesDialog=OFF \
Signature · 1 line
2.3.1
PATCH v4 1/1 cmake: don't use any header available in $(HOST_DIR)/usr/include
Hi Fabio, all,
Quoted 6 lines · Fabio Porcedda
The -I<dir> options added to
CMAKE_C_FLAGSare passed to the compiler before the -I<dir> options of the cmake internal headers, so when the host-xz package was already built, a #include <lzma.h> directive loads the host-xz header instead of the cmake internal one.Because we don't want to use any header avaiable in -I$(HOST_DIR)/usr/include,
s/avaiable/available/
Quoted 23 lines
just get rid of the -I<dir> options in the
HOST_CFLAGS.Fix build failure:
make host-xz host-cmake
.../output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:17:1: error: conflicting types for 'lzma_block_buffer_decode'
lzma_block_buffer_decode(lzma_block *block,lzma_allocator*allocator,
^
In file included from/home/tetsuya/buildroot/br2/output/host/usr/include/lzma.h:296:0,
from/home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/common.h:34, from/home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_decoder.h:16, from/home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:13:/home/tetsuya/buildroot/br2/output/host/usr/include/lzma/block.h:577:27: note: previous declaration of 'lzma_block_buffer_decode' was here
externLZMA_API(lzma_ret)lzma_block_buffer_decode(^Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/build.make:261: recipe for target '
Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o' failed make[3]: *** [Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o] Error 1Fixes:
http://autobuild.buildroot.org/results/4edf6e169dc4a00d8a8bd16a86eba2316cbbd9e5
http://autobuild.buildroot.org/results/a9ff38b22a36a2f8427d33085d3263a8cbfbd746
http://autobuild.buildroot.org/results/ecaa0227249207b5450519832a193c1585ac8177
Quoted 4 lines
Signed-off-by Fabio Porcedda <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Baruch Siach <[email protected]>Cc Samuel Martin <[email protected]>
Regards,
Signature · 1 line
Samuel
PATCH v4 1/1 cmake: don't use any header available in $(HOST_DIR)/usr/include
In reply to Fabio PorceddaDear Fabio Porcedda,
Quoted 29 lines · Fabio Porcedda
The -I<dir> options added to
CMAKE_C_FLAGSare passed to the compiler before the -I<dir> options of the cmake internal headers, so when the host-xz package was already built, a #include <lzma.h> directive loads the host-xz header instead of the cmake internal one.Because we don't want to use any header avaiable in -I$(HOST_DIR)/usr/include, just get rid of the -I<dir> options in the
HOST_CFLAGS.Fix build failure:
make host-xz host-cmake
.../output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:17:1: error: conflicting types for ?lzma_block_buffer_decode?
lzma_block_buffer_decode(lzma_block *block,lzma_allocator*allocator,
^
In file included from/home/tetsuya/buildroot/br2/output/host/usr/include/lzma.h:296:0,
from/home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/common.h:34, from/home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_decoder.h:16, from/home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:13:/home/tetsuya/buildroot/br2/output/host/usr/include/lzma/block.h:577:27: note: previous declaration of ?lzma_block_buffer_decode? was here
externLZMA_API(lzma_ret)lzma_block_buffer_decode(^Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/build.make:261: recipe for target '
Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o' failed make[3]: *** [Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o] Error 1Fixes:
http://autobuild.buildroot.org/results/4edf6e169dc4a00d8a8bd16a86eba2316cbbd9e5
http://autobuild.buildroot.org/results/a9ff38b22a36a2f8427d33085d3263a8cbfbd746
http://autobuild.buildroot.org/results/ecaa0227249207b5450519832a193c1585ac8177
Quoted 4 lines
Signed-off-by Fabio Porcedda <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Baruch Siach <[email protected]>Cc Samuel Martin <[email protected]>
Thanks, I applied this patch, but I did some further changes:
[Thomas:
- simplify the sed expression. Instead of trying to remove '-I <something>' from $(HOST_CFLAGS), simply remove $(HOST_CPPFLAGS) from $(HOST_CFLAGS).
- add the same logic for HOST_CXXFLAGS.]
See the final commit at
http://git.buildroot.net/buildroot/commit/?id=46bf8e8fd2428a733486ca192ba93588a7ac8d0e.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com