Disable LTO when building lxqt, should help building on non-clang

non-lld archs.
From Elias M. Mariani (maintainer) with hints from George Koehler.
This commit is contained in:
landry 2018-12-01 08:44:39 +00:00
parent fee2997fc1
commit 48ba6219ac
4 changed files with 26 additions and 4 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/09/14 15:17:26 rsadowski Exp $ # $OpenBSD: Makefile,v 1.2 2018/12/01 08:44:39 landry Exp $
COMMENT = various packaging tools and scripts for LXQt applications COMMENT = various packaging tools and scripts for LXQt applications
VERSION = 0.5.0 VERSION = 0.5.0
REVISION = 0
NAME = lxqt-build-tools NAME = lxqt-build-tools
DISTNAME = ${NAME}-${VERSION} DISTNAME = ${NAME}-${VERSION}

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-cmake_modules_LXQtCompilerSettings_cmake,v 1.1.1.1 2018/09/14 15:17:26 rsadowski Exp $ $OpenBSD: patch-cmake_modules_LXQtCompilerSettings_cmake,v 1.2 2018/12/01 08:44:39 landry Exp $
Index: cmake/modules/LXQtCompilerSettings.cmake Index: cmake/modules/LXQtCompilerSettings.cmake
--- cmake/modules/LXQtCompilerSettings.cmake.orig --- cmake/modules/LXQtCompilerSettings.cmake.orig
@ -20,3 +20,13 @@ Index: cmake/modules/LXQtCompilerSettings.cmake
) )
set(CMAKE_EXE_LINKER_FLAGS set(CMAKE_EXE_LINKER_FLAGS
"${SYMBOLIC_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" "${SYMBOLIC_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}"
@@ -153,7 +153,8 @@ endif()
# Turn on more aggrassive optimizations not supported by CMake
# References: https://wiki.qt.io/Performance_Tip_Startup_Time
#-----------------------------------------------------------------------------
-if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX)
+if ((CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) AND
+ NOT (CMAKE_SYSTEM_NAME STREQUAL OpenBSD))
# -flto: use link-time optimizations to generate more efficient code
if (CMAKE_COMPILER_IS_GNUCXX)
set(LTO_FLAGS "-flto -fuse-linker-plugin")

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/09/14 15:17:26 rsadowski Exp $ # $OpenBSD: Makefile,v 1.2 2018/12/01 08:44:39 landry Exp $
COMMENT = qt implementation of freedesktop.org xdg specs COMMENT = qt implementation of freedesktop.org xdg specs
VERSION = 3.2.0 VERSION = 3.2.0
REVISION = 0
NAME = libqtxdg NAME = libqtxdg
DISTNAME = ${NAME}-${VERSION} DISTNAME = ${NAME}-${VERSION}

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-cmake_compiler_settings_cmake,v 1.1.1.1 2018/09/14 15:17:26 rsadowski Exp $ $OpenBSD: patch-cmake_compiler_settings_cmake,v 1.2 2018/12/01 08:44:39 landry Exp $
Index: cmake/compiler_settings.cmake Index: cmake/compiler_settings.cmake
--- cmake/compiler_settings.cmake.orig --- cmake/compiler_settings.cmake.orig
@ -20,3 +20,13 @@ Index: cmake/compiler_settings.cmake
) )
set(CMAKE_EXE_LINKER_FLAGS set(CMAKE_EXE_LINKER_FLAGS
"${SYMBOLIC_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" "${SYMBOLIC_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}"
@@ -147,7 +147,8 @@ endif()
# Turn on more aggrassive optimizations not supported by CMake
# References: https://wiki.qt.io/Performance_Tip_Startup_Time
#-----------------------------------------------------------------------------
-if (CMAKE_COMPILER_IS_GNUCXX OR QTXDG_COMPILER_IS_CLANGCXX)
+if ((CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) AND
+ NOT (CMAKE_SYSTEM_NAME STREQUAL OpenBSD))
# -flto: use link-time optimizations to generate more efficient code
if (CMAKE_COMPILER_IS_GNUCXX)
set(LTO_FLAGS "-flto -fuse-linker-plugin")