[neon/qt6/qt6-webengine/Neon/release] debian: get rid of the build flags since tooling strips them anyway

Carlos De Maine null at kde.org
Mon Oct 30 09:18:13 GMT 2023


Git commit 90c28484b408e832bead19d9aeaae634f749234c by Carlos De Maine.
Committed on 26/10/2023 at 00:06.
Pushed by carlosdem into branch 'Neon/release'.

get rid of the build flags since tooling strips them anyway

M  +2    -3    debian/control
M  +0    -23   debian/rules

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/90c28484b408e832bead19d9aeaae634f749234c

diff --git a/debian/control b/debian/control
index 334e22e..35b80ed 100644
--- a/debian/control
+++ b/debian/control
@@ -130,8 +130,7 @@ Package: qt6-webengine-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: libqt6webchannel6-dev,
-         qt6-base-dev,
+Depends: qt6-base-dev,
          qt6-declarative-dev,
          qt6-positioning-dev,
          qt6-webchannel-dev,
@@ -154,7 +153,7 @@ Section: kde
 X-Neon-MergedPackage: true
 Depends: qt6-base-doc,
          qt6-webengine-dev (= ${binary:Version}),
-         ${misc:Depends},
+         ${misc:Depends}
 Description: Qt 6 WebEngine library - documentation files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/rules b/debian/rules
index a39dc52..58513d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,29 +5,6 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 export DH_VERBOSE = 1
 
-PARALLEL_OPTION = $(filter parallel=%,$(DEB_BUILD_OPTIONS))
-ifneq (,$(PARALLEL_OPTION))
-	NUMJOBS = $(patsubst parallel=%,%,$(PARALLEL_OPTION))
-	export NINJAJOBS = -j$(NUMJOBS)
-	# Limit parallelism for armhf
-	ifeq (armhf, $(DEB_HOST_ARCH))
-		ifeq ($(shell test $(NUMJOBS) -gt 6; echo $$?),0)
-			export NINJAFLAGS = -j6
-			export NINJAJOBS = -j6
-		endif
-	endif
-endif
-
-# Reduce memory consumption on certain architectures
-ifeq (armhf, $(DEB_HOST_ARCH))
-export LDFLAGS+=-Wl,--no-keep-memory
-endif
-
-ifeq (i386, $(DEB_HOST_ARCH))
-export LDFLAGS+=-Wl,--no-keep-memory
-endif
-
-
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 



More information about the Neon-commits mailing list