Revert "lxqt-build-tools: avoid using host build tools"
This reverts commit d0087536a0.
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
From 7f5bc2099f1bf7a83dfa8d1ae5f4fe03104ce37e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
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 <schnitzeltony@googlemail.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -9,10 +9,7 @@ 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 \
|
||||
file://0001-ensure-the-use-correct-gcc-tools.patch \
|
||||
"
|
||||
SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master"
|
||||
SRCREV = "b38c9e0d12877702f0d12b749f69579626c36054"
|
||||
PV = "0.3.2"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user