diff --git a/recipes-lxqt/lxqt-build-tools/files/0001-ensure-the-use-correct-gcc-tools.patch b/recipes-lxqt/lxqt-build-tools/files/0001-ensure-the-use-correct-gcc-tools.patch new file mode 100644 index 00000000..1760613f --- /dev/null +++ b/recipes-lxqt/lxqt-build-tools/files/0001-ensure-the-use-correct-gcc-tools.patch @@ -0,0 +1,33 @@ +From 7f5bc2099f1bf7a83dfa8d1ae5f4fe03104ce37e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 13 Apr 2017 12:35:25 +0200 +Subject: [PATCH] ensure the use correct gcc tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + cmake/modules/LXQtCompilerSettings.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/LXQtCompilerSettings.cmake b/cmake/modules/LXQtCompilerSettings.cmake +index 2b1e774..6974732 100644 +--- a/cmake/modules/LXQtCompilerSettings.cmake ++++ b/cmake/modules/LXQtCompilerSettings.cmake +@@ -158,8 +158,8 @@ if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) + # http://hubicka.blogspot.tw/2014/04/linktime-optimization-in-gcc-2-firefox.html + # https://github.com/monero-project/monero/pull/1065/commits/1855213c8fb8f8727f4107716aab8e7ba826462b + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0") # gcc >= 4.9 +- set(CMAKE_AR "gcc-ar") +- set(CMAKE_RANLIB "gcc-ranlib") ++ set(CMAKE_AR "$ENV{AR}") ++ set(CMAKE_RANLIB "$ENV{RANLIB}") + endif() + elseif (LXQT_COMPILER_IS_CLANGCXX) + # The link-time optimization of clang++/llvm seems to be too aggrassive. +-- +2.9.3 + diff --git a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb index 8444d63f..d1baca23 100644 --- a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb +++ b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb @@ -9,7 +9,10 @@ do_configure_append() { sed -i 's:set(LXQT_ETC_XDG_DIR.*:set(LXQT_ETC_XDG_DIR "${sysconfdir}/xdg"):' ${B}/install/LXQtConfigVars.cmake } -SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master" +SRC_URI = " \ + git://github.com/lxde/${BPN}.git \ + file://0001-ensure-the-use-correct-gcc-tools.patch \ +" SRCREV = "b38c9e0d12877702f0d12b749f69579626c36054" PV = "0.3.2" S = "${WORKDIR}/git"