[neon/neon-packaging/kdsoap/Neon/release-lts] debian: drop static build

Harald Sitter null at kde.org
Mon Jul 5 11:01:36 BST 2021


Git commit 140cc9d15c5b86cd9c9f6fea04491729e113d829 by Harald Sitter.
Committed on 05/07/2021 at 10:00.
Pushed by sitter into branch 'Neon/release-lts'.

drop static build

we (neon) do not know why it is there and besides the fact that static
libs are wonky donky from a distro POV it's also blowing up the build
needlessly as everything is built twice

there also is no use case for it that we care about

this then also allows us to drop a whole bunch of override logic as now
debhelper is perfectly capable of executing the build "properly"

M  +0    -1    debian/libkdsoap-dev.install
M  +3    -12   debian/rules

https://invent.kde.org/neon/neon-packaging/kdsoap/commit/140cc9d15c5b86cd9c9f6fea04491729e113d829

diff --git a/debian/libkdsoap-dev.install b/debian/libkdsoap-dev.install
index 7296622..126fdc7 100644
--- a/debian/libkdsoap-dev.install
+++ b/debian/libkdsoap-dev.install
@@ -1,7 +1,6 @@
 usr/bin
 usr/include
 usr/lib/*/cmake
-usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/lib/*/qt5/mkspecs/modules/
 usr/share/doc/KDSoap/*.pri
diff --git a/debian/rules b/debian/rules
index ffdc6ce..658320f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,29 +8,20 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-BUILDDIR=cmake-bin
-INSTALLDIR=debian/tmp
-
 override_dh_auto_clean:
-	rm -rf $(BUILDDIR)* doc/latex doc/refman
+	rm -rf doc/latex doc/refman
 	rm -f doxygen.log kdsoap.log kdsoap.tag
 
 override_dh_auto_configure:
-	dh_auto_configure --parallel -B$(BUILDDIR)-static -- -DKDSoap_STATIC=ON
-	dh_auto_configure --parallel -B$(BUILDDIR)-shared -- #-DKDSoap_TESTS=ON
+	dh_auto_configure -- #-DKDSoap_TESTS=ON
 
 override_dh_auto_build:
 	doxygen Doxyfile
-	dh_auto_build --parallel -B$(BUILDDIR)-static/src
-	dh_auto_build --parallel -B$(BUILDDIR)-shared
+	dh_auto_build
 
 #override_dh_auto_test:
 #	dh_auto_test --parallel -B$(BUILDDIR)-shared
 
-override_dh_auto_install:
-	dh_auto_install --parallel -B$(BUILDDIR)-static/src --destdir=$(CURDIR)/$(INSTALLDIR)
-	dh_auto_install --parallel -B$(BUILDDIR)-shared --destdir=$(CURDIR)/$(INSTALLDIR)
-
 override_dh_install:
 	dh_install -plibkdsoap-doc -Xjquery.js
 	dh_install --remaining-packages



More information about the Neon-commits mailing list