ruby: Remove __has_include and __has_include_next from preprocessed header file
PATCH 1/1 ruby: Remove __has_include and __has_include_next from preprocessed header file
one of the build steps ruby has is that it generated rb_mjit_header.h during configure using gcc preprocessor using -dD which emits built-in defines as well, problem happens when this header is later included in subsequent compiles, where compiler errors out stating that an existing internal define is redefined
| /tmp/20200123-2021083-2c601q.h:13849:9: error: "__has_include" cannot be used as a macro name | 13849 | #define __has_include __has_include | | ^~~~~~~~~~~~~ | compilation terminated due to -Wfatal-errors.
Since compiler already will take care of it internally we can edit it out from this header file
Signed-off-by Khem Raj <[email protected]>
--- meta/recipes-devtools/ruby/ruby.inc | 7 +++++++ 1 file changed, 7 insertions(+)
meta/recipes-devtools/ruby/ruby.inc +7 -0
@@ -38,3 +38,10 @@ do_configure_prepend() { sed -i "s#%%TARGET_CFLAGS%%#$CFLAGS#; s#%%TARGET_LDFLAGS%%#$LDFLAGS#" ${S}/common.mk rm -rf ${S}/ruby/ } + +do_compile_prepend() { + if [ -e ${B}/rb_mjit_header.h ]; then + sed -i -e "/#define __has_include __has_include/d" ${B}/rb_mjit_header.h + sed -i -e "/#define __has_include_next __has_include_next/d" ${B}/rb_mjit_header.h + fi +}
Signature · 1 line
2.25.0