[neon/qt6/qt6-remoteobjects/Neon/unstable] debian: need gcc 12.1 for mold to be able to process --gdb-index && clean installs

Carlos De Maine null at kde.org
Sat Oct 28 14:43:33 BST 2023


Git commit 51979d47cc9b22072d6e247c444e731dd4c1b01a by Carlos De Maine.
Committed on 28/10/2023 at 15:43.
Pushed by carlosdem into branch 'Neon/unstable'.

need gcc 12.1 for mold to be able to process --gdb-index && clean installs

M  +3    -0    debian/control
M  +0    -33   debian/not-installed
M  +13   -84   debian/qt6-remoteobjects-dev.install
M  +1    -3    debian/qt6-remoteobjects.install
M  +7    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-remoteobjects/-/commit/51979d47cc9b22072d6e247c444e731dd4c1b01a

diff --git a/debian/control b/debian/control
index 49fe1db..62c5174 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,13 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               g++-12,
+               gcc-12,
                libgl-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
                libxkbcommon-dev,
+               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/not-installed b/debian/not-installed
index 773dad7..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,33 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QIOQnxSource
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QIntHash
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QQnxNativeIo
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QQnxNativeServer
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qconnection_qnx_qiodevices.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qconnection_qnx_server.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/QRegexParser
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/QtRepParser
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/QtRepParserDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/QtRepParserVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/parser.g
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/qregexparser.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/qtrepparserversion.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserVersionlessTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repparser.prf
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_remoteobjects_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_remoteobjectsqml_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_repparser.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_repparser_private.pri
diff --git a/debian/qt6-remoteobjects-dev.install b/debian/qt6-remoteobjects-dev.install
index ffcd704..c68c7cb 100644
--- a/debian/qt6-remoteobjects-dev.install
+++ b/debian/qt6-remoteobjects-dev.install
@@ -1,88 +1,17 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QAbstractItemModelReplica
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QConnectionAbstractServer
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectAbstractPersistedStore
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectDynamicReplica
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectHost
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectHostBase
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectNode
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectPendingCall
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectPendingCallWatcher
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectPendingReply
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectRegistry
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectRegistryHost
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectReplica
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectSettingsStore
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectSourceLocation
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectSourceLocationInfo
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QRemoteObjectSourceLocations
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtROClientFactory
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtROClientIoDevice
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtROIoDeviceBase
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtROServerFactory
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtROServerIoDevice
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtRemoteObjects
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtRemoteObjectsDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/QtRemoteObjectsVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qconnectionfactories.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectabstractitemmodelreplica.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectdynamicreplica.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectnode.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectpendingcall.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectregistry.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectreplica.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectsettingsstore.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectsource.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjectglobal.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjects-config.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjectsexports.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjectsversion.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/QtRemoteObjectsQml
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/QtRemoteObjectsQmlDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/QtRemoteObjectsQmlVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtRemoteObjectsTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsMacros.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsVersionlessTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlVersionlessTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsVersionlessTargets.cmake
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRepParser/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjects.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjects.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjectsQml.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjectsQml.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6remoteobjects_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6remoteobjectsqml_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6RemoteObjects.pc
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6RemoteObjectsQml.pc
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6RepParser.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/remoteobjects_repc.prf
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repcclient.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repccommon.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repcmerged.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repcserver.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_remoteobjects.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_remoteobjectsqml.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_repparser.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/RemoteObjects.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/RemoteObjectsQml.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/RepParser.json
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-remoteobjects.install b/debian/qt6-remoteobjects.install
index 6c9f081..883f337 100644
--- a/debian/qt6-remoteobjects.install
+++ b/debian/qt6-remoteobjects.install
@@ -1,6 +1,4 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjects.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjectsQml.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/libdeclarative_remoteobjectsplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/
 usr/lib/qt6/libexec/repc
diff --git a/debian/rules b/debian/rules
index 055263c..9ae03aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,10 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-# QT_HOST_PATH isn't passed in cross-builds
+# need gcc 12.1 for mold to be able to process --gdb-index
+export CC=gcc-12
+export CXX=g++-12
+
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += \
 		-DQT_HOST_PATH=/usr \
@@ -17,8 +20,10 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
 override_dh_auto_build-indep:


More information about the Neon-commits mailing list