Your message dated Thu, 06 Jun 2024 23:43:56 +0200 with message-id <3015284.ElGaqSPkdT@treadstone-71> and subject line has caused the Debian Bug report #1069810, regarding qt6-tools:6.4.2: Please add support for loongarch64 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 1069810: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069810 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: submit@bugs.debian.org
- Cc: 王洪虎 <wanghonghu@loongson.cn>, 宋鼎 <songding@loongson.cn>, 杨小娟 <yangxiaojuan@loongson.cn>, 桑猛 <sangmeng@loongson.cn>
- Subject: qt6-tools:6.4.2: Please add support for loongarch64
- From: 王怀卿 <wanghuaiqing@loongson.cn>
- Date: Thu, 25 Apr 2024 15:10:24 +0800 (GMT+08:00)
- Message-id: <701d65d5.1292.18f1417555b.Coremail.wanghuaiqing@loongson.cn>
Source: qt6-tools
Version: 6.4.2
Severity: wishlist
Tags: ftbfs patch
User: debian-loongarch@lists.debian.org
Usertags: loong64
We need to add architectural support for qt6-tools-6.4.2
Otherwise it will build failures .
Please consider the following patch that I metioned.
Would it be possible to include the support for LoongArch in the next upload?
If you have any questions, you can contact me at any time.
root@loongson:/home/loongson/whq/qt6-tools-6.4.2# dpkg-buildpackage
dpkg-buildpackage: info: source package qt6-tools
dpkg-buildpackage: info: source version 6.4.2-3
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
dpkg-buildpackage: info: host architecture loong64
dpkg-source --before-build .
dpkg-checkbuilddeps: error: Unmet build dependencies: clang-15 libclang-15-dev llvm-15-dev
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
For some reasons, we are unable to build LLVM-15 version on the loong64 architecture.
Therefore, we need to build qt6-tools on a higher version of LLVM.
Consequently, we need to modify the control file in the Debian directory.
diff --git a/debian/control b/debian/control
index 2d95429..deaa591 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Patrick Franz <deltaone@debian.org>,
-Build-Depends: clang-15,
+Build-Depends: clang,
cmake (>= 3.24~),
debhelper-compat (= 13),
- libclang-15-dev,
+ libclang-dev,
libgl-dev,
liblitehtml-dev (>= 0.6~),
libssl-dev,
libvulkan-dev [linux-any],
libxcb-xkb-dev,
- llvm-15-dev,
+ llvm-dev,
ninja-build,
pkg-config,
pkg-kde-tools,
Additionally, since we are compiling with a higher version of LLVM,
we also need to backport some upstream code into this version of qt6-tools.
commit 87fac2de7378963e753a847da667d52d4ba95bff
Author: Björn Schäpers <bjoern@hazardy.de>
Date: Wed Feb 8 12:31:04 2023 +0100
lupdate: Fix build with clang 16+
The signature changed again.
I've tested it with a current main, that is clang 17, but the commit
854c10f8d185286d941307e1033eb492e085c203 with introduced the change is
also contained in clang 16.
Pick-to: 6.4 6.5
Change-Id: I050ca5843708be4489757538849000d3675005ac
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
index d963747d8..478d5fbea 100644
--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
@@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/,
clang::CharSourceRange /*filenameRange*/,
-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
+ const clang::OptionalFileEntryRef file,
+#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
const clang::Optional<clang::FileEntryRef> file,
#else
const clang::FileEntry *file,
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
index 3e44cee83..673ecb495 100644
--- a/src/linguist/lupdate/lupdatepreprocessoraction.h
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
@@ -52,7 +52,9 @@ private:
void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
clang::StringRef /*fileName*/, bool /*isAngled*/,
clang::CharSourceRange /*filenameRange*/,
-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
+ const clang::OptionalFileEntryRef file,
+#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
const clang::Optional<clang::FileEntryRef> file,
#else
const clang::FileEntry *file,
本邮件及其附件含有龙芯中科的商业秘密信息,仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用(包括但不限于全部或部分地泄露、复制或散发)本邮件及其附件中的信息。如果您错收本邮件,请您立即电话或邮件通知发件人并删除本邮件。
This email and its attachments contain confidential information from Loongson Technology , which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this email in error, please notify the sender by phone or email immediately and delete it.
--- End Message ---
--- Begin Message ---
- To: 1069810-done@bugs.debian.org
- From: Patrick Franz <deltaone@debian.org>
- Date: Thu, 06 Jun 2024 23:43:56 +0200
- Message-id: <3015284.ElGaqSPkdT@treadstone-71>
Fixed with the upload of qt6-tools 6.6.2-3 to unstable which makes qt6-tools build on loongarch64.
--- End Message ---