From d498eb607514eefaf0548c4377d5c8cdbdcb46c3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Sep 2018 03:28:57 -0700 Subject: qtwebkit: Use relative paths for pri files when cross compile This helps in compiling examples etc. without hardcoded headers Signed-off-by: Khem Raj --- ...cmake-Do-not-generate-hardcoded-include-p.patch | 40 ++++ ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 204 --------------------- recipes-qt/qt5/qtwebkit_git.bb | 5 +- 3 files changed, 43 insertions(+), 206 deletions(-) create mode 100644 recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch new file mode 100644 index 00000000..8c718b47 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch @@ -0,0 +1,40 @@ +From c00c61a42f9076aecad195b7f72b7db9b3601181 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 24 Sep 2018 02:11:10 -0700 +Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths + +If we do not use this define,then it falls into else case which +generated .pri files with /usr/include and so on for includes and +compiler does not like specifying absolute include paths pointing to +build host includes + +Signed-off-by: Khem Raj +--- + Source/WebKit/PlatformQt.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake +index 3792def6f..b6cb36bb1 100644 +--- a/Source/WebKit/PlatformQt.cmake ++++ b/Source/WebKit/PlatformQt.cmake +@@ -510,7 +510,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) + install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) + endif () + +-if (KDE_INSTALL_USE_QT_SYS_PATHS) ++if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE) + set(WebKit_PRI_ARGUMENTS + BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" + LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" +@@ -734,7 +734,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) + install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) + endif () + +-if (KDE_INSTALL_USE_QT_SYS_PATHS) ++if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE) + set(WebKitWidgets_PRI_ARGUMENTS + BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" + LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" +-- +2.19.0 + diff --git a/recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted file mode 100644 index c24eb69e..00000000 --- a/recipes-qt/qt5/qtwebkit/0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null @@ -1,204 +0,0 @@ -From ef1b87e4ce8db720a4d7f5ee80fec4388dc3b086 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 24 Aug 2018 07:13:39 +0000 -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem - -gcc-6 has now introduced stdlib.h in libstdc++ for better -compliance and its including the C library stdlib.h using -include_next which is sensitive to order of system header -include paths. Its infact better to not tinker with the -system header include paths at all. Since adding /usr/include -to -system is redundant and compiler knows about it moreover -now with gcc6 it interferes with compiler's functioning -and ends up with compile errors e.g. - -/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- - Source/WebKit/qt/declarative/CMakeLists.txt | 2 +- - Source/WebKit/qt/tests/CMakeLists.txt | 2 +- - Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt | 2 +- - Source/cmake/WebKitMacros.cmake | 2 +- - Tools/DumpRenderTree/CMakeLists.txt | 2 +- - Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +- - Tools/ImageDiff/CMakeLists.txt | 2 +- - Tools/MiniBrowser/qt/CMakeLists.txt | 2 +- - Tools/QtTestBrowser/CMakeLists.txt | 2 +- - Tools/TestWebKitAPI/PlatformQt.cmake | 2 +- - Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt | 2 +- - Tools/WebKitTestRunner/CMakeLists.txt | 2 +- - 13 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt -index 27d81336f..9480f6d88 100644 ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(jsc ${JSC_SOURCES}) - target_link_libraries(jsc ${JSC_LIBRARIES}) - set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore") -diff --git a/Source/WebKit/qt/declarative/CMakeLists.txt b/Source/WebKit/qt/declarative/CMakeLists.txt -index e1ba22bc1..84cb56544 100644 ---- a/Source/WebKit/qt/declarative/CMakeLists.txt -+++ b/Source/WebKit/qt/declarative/CMakeLists.txt -@@ -15,7 +15,7 @@ include_directories( - - ${WTF_DIR} - ) --include_directories(SYSTEM -+include_directories( - ${ICU_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} -diff --git a/Source/WebKit/qt/tests/CMakeLists.txt b/Source/WebKit/qt/tests/CMakeLists.txt -index 3dc6af1d5..d821f0284 100644 ---- a/Source/WebKit/qt/tests/CMakeLists.txt -+++ b/Source/WebKit/qt/tests/CMakeLists.txt -@@ -7,7 +7,7 @@ include_directories( - "${WEBKIT_DIR}/qt/WidgetApi" - ) - --include_directories(SYSTEM -+include_directories( - ${ICU_INCLUDE_DIRS} - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} -diff --git a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt -index 210342ef5..bfc768fa0 100644 ---- a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt -+++ b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt -@@ -4,7 +4,7 @@ include_directories( - "${WEBKIT_DIR}/qt/Api" - ) - --include_directories(SYSTEM -+include_directories( - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${Qt5QuickTest_INCLUDE_DIRS} -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index 07e31432a..a1e58873f 100644 ---- a/Source/cmake/WebKitMacros.cmake -+++ b/Source/cmake/WebKitMacros.cmake -@@ -260,7 +260,7 @@ endmacro() - - macro(WEBKIT_FRAMEWORK _target) - include_directories(${${_target}_INCLUDE_DIRECTORIES}) -- include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) -+ include_directories(${${_target}_SYSTEM_INCLUDE_DIRECTORIES}) - add_library(${_target} ${${_target}_LIBRARY_TYPE} - ${${_target}_HEADERS} - ${${_target}_SOURCES} -diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt -index 4a726ccaf..cd0c5e303 100644 ---- a/Tools/DumpRenderTree/CMakeLists.txt -+++ b/Tools/DumpRenderTree/CMakeLists.txt -@@ -115,7 +115,7 @@ list(APPEND TestNetscapePlugin_LIBRARIES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${DumpRenderTree_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${DumpRenderTree_SYSTEM_INCLUDE_DIRECTORIES}) - - add_executable(DumpRenderTree ${DumpRenderTree_SOURCES}) - target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES}) -diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -index c431667b2..6dff24475 100644 ---- a/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt -@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES - ) - - include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES}) - - set(WebKitTestNetscapePlugin_LIBRARIES - ${X11_LIBRARIES} -diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt -index 6ce4ed522..4dd6c4adf 100644 ---- a/Tools/ImageDiff/CMakeLists.txt -+++ b/Tools/ImageDiff/CMakeLists.txt -@@ -14,7 +14,7 @@ set(IMAGE_DIFF_LIBRARIES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) - target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) - set_target_properties(ImageDiff PROPERTIES FOLDER "Tools") -diff --git a/Tools/MiniBrowser/qt/CMakeLists.txt b/Tools/MiniBrowser/qt/CMakeLists.txt -index 68dd13c8b..b491df2a8 100644 ---- a/Tools/MiniBrowser/qt/CMakeLists.txt -+++ b/Tools/MiniBrowser/qt/CMakeLists.txt -@@ -64,7 +64,7 @@ if (ENABLE_TEST_SUPPORT) - endif () - - include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(MiniBrowser ${MiniBrowser_SOURCES}) - target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) - set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) -diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt -index ccd8e0ff2..18de9f274 100644 ---- a/Tools/QtTestBrowser/CMakeLists.txt -+++ b/Tools/QtTestBrowser/CMakeLists.txt -@@ -62,7 +62,7 @@ if (ENABLE_TEST_SUPPORT) - endif () - - include_directories(${QtTestBrowser_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(QtTestBrowser ${QtTestBrowser_SOURCES}) - target_link_libraries(QtTestBrowser ${QtTestBrowser_LIBRARIES}) - set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools" AUTOMOC ON) -diff --git a/Tools/TestWebKitAPI/PlatformQt.cmake b/Tools/TestWebKitAPI/PlatformQt.cmake -index c054c661b..046a91abc 100644 ---- a/Tools/TestWebKitAPI/PlatformQt.cmake -+++ b/Tools/TestWebKitAPI/PlatformQt.cmake -@@ -7,7 +7,7 @@ include_directories( - ${TESTWEBKITAPI_DIR} - ) - --include_directories(SYSTEM -+include_directories( - ${ICU_INCLUDE_DIRS} - ${Qt5Gui_INCLUDE_DIRS} - ) -diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -index b0b473962..434e4ca25 100644 ---- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -+++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt -@@ -23,7 +23,7 @@ include_directories( - ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk - ) - --include_directories(SYSTEM -+include_directories( - ${ATSPI_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt -index 6355772ce..627965858 100644 ---- a/Tools/WebKitTestRunner/CMakeLists.txt -+++ b/Tools/WebKitTestRunner/CMakeLists.txt -@@ -116,7 +116,7 @@ GENERATE_BINDINGS(WebKitTestRunner_SOURCES - WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) - - add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) - target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 0a978357..a137b2f9 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -14,8 +14,8 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- SRC_URI += "\ file://0001-Do-not-skip-build-for-cross-compile.patch \ file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ - file://0003-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0004-Fix-build-bug-for-armv32-BE.patch \ + file://0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ " inherit cmake_qt5 perlnative pythonnative @@ -40,8 +40,9 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb" # https://bugzilla.redhat.com/show_bug.cgi?id=1582954 CXXFLAGS += "-fpermissive" -EXTRA_OECMAKE = " \ +EXTRA_OECMAKE += " \ -DPORT=Qt \ + -DCROSS_COMPILE=ON \ -DECM_MKSPECS_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/modules \ -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ " -- cgit v1.2.3