From fa492094198e3c6f0e0de43fe197ef15121b31b2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 21 Feb 2020 19:14:01 +0100 Subject: [PATCH] Issue #496 fixed (CentOS 8 builds) --- build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 7a8e95ee7..6c6150e8f 100755 --- a/build.sh +++ b/build.sh @@ -591,8 +591,6 @@ qmake_options=( -recursive CONFIG+="$CONFIG" RUBYLIBFILE="$RUBYLIBFILE" - RUBYINCLUDE="$RUBYINCLUDE" - RUBYINCLUDE2="$RUBYINCLUDE2" RUBYVERSIONCODE="$RUBYVERSIONCODE" HAVE_RUBY="$HAVE_RUBY" PYTHON="$PYTHON" @@ -613,6 +611,16 @@ qmake_options=( KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV" ) +# NOTE: qmake does not like include paths which clash with paths built into the compiler +# hence we don't add RUBYINCLUDE or RUBYINCLUDE2 in this case (found on CentOS 8 where Ruby +# headers are installed in /usr/include) +if [ "$RUBYINCLUDE" != "/usr/include" ] && [ "$RUBYINCLUDE" != "/usr/local/include" ]; then + qmake_options+=( RUBYINCLUDE="$RUBYINCLUDE" ) +fi +if [ "$RUBYINCLUDE2" != "/usr/include" ] && [ "$RUBYINCLUDE2" != "/usr/local/include" ]; then + qmake_options+=( RUBYINCLUDE2="$RUBYINCLUDE2" ) +fi + # This should speed up build time considerably # https://ortogonal.github.io/ccache-and-qmake-qtcreator/ if [ "$QMAKE_CCACHE" = 1 ]; then