[neon/qt6/qt6-base/Neon/unstable] debian: so /usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6 script is required

Carlos De Maine null at kde.org
Sat Nov 25 13:48:51 GMT 2023


Git commit f42ff8292d9ce5aa122d4eca6f0e0d4b317d1c29 by Carlos De Maine.
Committed on 25/11/2023 at 14:48.
Pushed by carlosdem into branch 'Neon/unstable'.

so /usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6 script is required

M  +6    -6    debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/f42ff8292d9ce5aa122d4eca6f0e0d4b317d1c29

diff --git a/debian/rules b/debian/rules
index 649b7be..b09ee63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,12 +111,12 @@ execute_after_dh_auto_install-arch:
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/qt.conf.in \
 		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/qt6.conf
 
-#	# Inject cross-wrapper for qmake6
-#	mkdir -p debian/tmp/usr/bin
-#	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
-#		-e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
-#		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
-#	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
+	# Inject cross-wrapper for qmake6
+	mkdir -p debian/tmp/usr/bin
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+		-e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
+		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
+	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
 
 	# Fix cmake config file's installed into /usr/lib/qt6/libexec
 	mv -v debian/tmp/usr/lib/qt6/libexec/*.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6/


More information about the Neon-commits mailing list