From 243e05f1de42d372abfecab721f8c40eee08548e Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:11:56 +0000 Subject: qtbase: fix cmake files to use our host binaries * only for qt 5.1.0; didn't had the time to port this to 5.0.2 * client recipes need to export OE_QMAKE_PATH_EXTERNAL_HOST_BINS in EXTRA_OECMAKE Signed-off-by: Simon Busch Signed-off-by: Martin Jansa --- ...E_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 47 ++++++++++++++++++++++ ...E_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 47 ++++++++++++++++++++++ ...E_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch | 47 ++++++++++++++++++++++ recipes-qt/qt5/qtbase.inc | 1 + 4 files changed, 142 insertions(+) create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch create mode 100644 recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch new file mode 100644 index 00000000..107ba30b --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -0,0 +1,47 @@ +From 27465c65419c1b5bdc8ed50e56428ff5fd64f62b Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Mon, 22 Jul 2013 21:09:41 +0000 +Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries + +Upstream-Status: Inappropiate (configuration) + +Signed-off-by: Simon Busch +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 4e0fcda..2bbb54c 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + # For CMake automoc feature +@@ -32,7 +32,7 @@ if (NOT TARGET Qt5::rcc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + IMPORTED_LOCATION \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" + !!ELSE +- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" ++ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\" + !!ENDIF + ) + endif() +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch new file mode 100644 index 00000000..00fa5aea --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -0,0 +1,47 @@ +From 26ea6bec700ebe345113558c334389cb408780c4 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Mon, 22 Jul 2013 21:09:41 +0000 +Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries + +Upstream-Status: Inappropiate (configuration) + +Signed-off-by: Simon Busch +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index a804278..a1f8492 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch new file mode 100644 index 00000000..aa51e2f8 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch @@ -0,0 +1,47 @@ +From 03ff55ff67ef7ab929d9b323484da382f6318df2 Mon Sep 17 00:00:00 2001 +From: Simon Busch +Date: Mon, 22 Jul 2013 21:09:41 +0000 +Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path + to host binaries + +Upstream-Status: Inappropiate (configuration) + +Signed-off-by: Simon Busch +--- + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index e01b448..2f6b8ea 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) + set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF + _qt5_Core_check_file_exists(${imported_location}) + +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 5c1b51b6..21386dcb 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -21,6 +21,7 @@ SRC_URI += " \ file://0021-configure-make-pulseaudio-a-configurable-option.patch \ file://0022-configure-make-alsa-a-configurable-option.patch \ file://0023-configure-make-freetype-a-configurable-option.patch \ + file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ " DEPENDS += "qtbase-native" -- cgit v1.2.3