diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-11 10:08:38 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-01-11 10:08:38 +0000 |
| commit | 8244fe99bcdbad7a2d0b22d66183394f5ffacd03 (patch) | |
| tree | c9a458d29164af55be5bf3330f3f659428ac04ac /devel/lxqt-build-tools | |
| parent | graphics/opencv2: reset maintainership (diff) | |
- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
Approved by: portmgr blanket
Diffstat (limited to 'devel/lxqt-build-tools')
| -rw-r--r-- | devel/lxqt-build-tools/Makefile | 14 | ||||
| -rw-r--r-- | devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake | 13 |
2 files changed, 2 insertions, 25 deletions
diff --git a/devel/lxqt-build-tools/Makefile b/devel/lxqt-build-tools/Makefile index c6e011d5a271..f37d8c1e83c5 100644 --- a/devel/lxqt-build-tools/Makefile +++ b/devel/lxqt-build-tools/Makefile @@ -12,17 +12,7 @@ COMMENT= Helpers CMake modules for LXQt LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/BSD-3-Clause -USES= cmake:outsource lxqt pkgconfig tar:xz +USES= cmake:outsource lxqt pkgconfig tar:xz USE_QT5= qmake_build buildtools_build core -.include <bsd.port.pre.mk> - -# When the CXX compiler is GNU 4.2.1 (DragonFlyBSD seems to have >= 4.7.x) -# we get the following errors: -# cc1plus: error: unrecognized command line option "-flto" -# cc1plus: error: unrecognized command line option "-fuse-linker-plugin" -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-cmake_modules_LXQtCompilerSettings.cmake -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake b/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake deleted file mode 100644 index 324f31c4fdc9..000000000000 --- a/devel/lxqt-build-tools/files/extra-patch-cmake_modules_LXQtCompilerSettings.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/modules/LXQtCompilerSettings.cmake.orig 2017-01-01 21:46:43 UTC -+++ cmake/modules/LXQtCompilerSettings.cmake -@@ -144,7 +144,9 @@ endif() - if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX) - # -flto: use link-time optimizations to generate more efficient code - if (CMAKE_COMPILER_IS_GNUCXX) -- set(LTO_FLAGS "-flto -fuse-linker-plugin") -+ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ set(LTO_FLAGS "-flto -fuse-linker-plugin") -+ endif() - # When building static libraries with LTO in gcc >= 4.9, - # "gcc-ar" and "gcc-ranlib" should be used instead of "ar" and "ranlib". - # references: |