pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qt6-qttools: fix rtti with clang
Module Name: pkgsrc-wip
Committed By: Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By: nros
Date: Mon Mar 8 18:31:21 2021 +0000
Changeset: bfa02449c2acc1d15d42a736068ff75e3e76f30d
Modified Files:
qt6-qttools/distinfo
qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
Log Message:
qt6-qttools: fix rtti with clang
also use -no-rtti with clang, the option is also supported by icc.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bfa02449c2acc1d15d42a736068ff75e3e76f30d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qt6-qttools/distinfo | 2 +-
qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diffs:
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index 5e258c05be..59d901ac91 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -4,4 +4,4 @@ SHA1 (qttools-everywhere-src-6.0.2.tar.xz) = 0983d7ff615d81a34171b78fcb497c21961
RMD160 (qttools-everywhere-src-6.0.2.tar.xz) = 1e9ab20c7256d8bf231bd0bb06409098702de0cc
SHA512 (qttools-everywhere-src-6.0.2.tar.xz) = 888519ced7955e8ee392591fbabd389dee0597b95006fde402571a2a5b0da8bb9d887a4e5d8eee017b4f7f44e7b5313dcb0b510276a98d2474a7535cca830420
Size (qttools-everywhere-src-6.0.2.tar.xz) = 8388156 bytes
-SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = 040034f45e8246403c28fe9738bd8f2c8c05872e
+SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = d70ea348c3ba7f64bcc245de9445becefecf3a9c
diff --git a/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt b/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
index 836b6553b5..91e0dae4aa 100644
--- a/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
+++ b/qt6-qttools/patches/patch-src_linguist_lupdate_CMakeLists.txt
@@ -4,16 +4,14 @@ Clang is compiled without rtti so when compiling with gcc turn of rtti
this fixes problems with undefined reference to things such as
"typeinfo for clang::ASTConsumer"
---- src/linguist/lupdate/CMakeLists.txt.orig 2021-01-28 00:04:44.000000000 +0000
+--- src/linguist/lupdate/CMakeLists.txt.orig 2021-02-25 02:26:59.000000000 +0000
+++ src/linguist/lupdate/CMakeLists.txt
-@@ -99,6 +99,10 @@ qt_internal_extend_target(${target_name}
+@@ -99,6 +99,8 @@ qt_internal_extend_target(${target_name} CONDITION QT_
# special case begin
if(QT_FEATURE_clangcpp)
set_property(SOURCE clangtoolastreader.cpp PROPERTY SKIP_AUTOMOC ON)
-+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-+ set_source_files_properties(cpp_clang.cpp lupdatepreprocessoraction.cpp
-+ PROPERTIES COMPILE_OPTIONS "-fno-rtti")
-+ endif()
++ set_source_files_properties(cpp_clang.cpp lupdatepreprocessoraction.cpp
++ PROPERTIES COMPILE_OPTIONS "-fno-rtti")
endif()
# special case end
Home |
Main Index |
Thread Index |
Old Index