[med-svn] [Git][med-team/libquazip][master] 2 commits: Build twice for inclusion of static lib

Nilesh Patra (@nilesh) gitlab at salsa.debian.org
Sun May 16 14:17:04 BST 2021 


Nilesh Patra pushed to branch master at Debian Med / libquazip


Commits:
49e8b663 by Nilesh Patra at 2021-05-16T13:07:35+00:00
Build twice for inclusion of static lib

- - - - -
25e10243 by Nilesh Patra at 2021-05-16T13:16:51+00:00
[skip ci] Update TODO

- - - - -


3 changed files:

- + debian/TODO
- debian/changelog
- debian/rules


Changes:

=====================================
debian/TODO
=====================================
@@ -0,0 +1,104 @@
+The build ends with the following now:
+
+It looks like SONAME has been changed. So either we need to change SONAME or change the name of corresponding binary packages.
+I'm not sure what might be best
+
+/usr/bin/cmake -P cmake_install.cmake
+-- Install configuration: "None"
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.so.1.1
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.so.1.0.0
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.so
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/JlCompress.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/ioapi.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/minizip_crypt.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quaadler32.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quachecksum32.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quacrc32.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quagzipfile.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quaziodevice.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazip.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazip_global.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazip_qt_compat.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazipdir.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazipfile.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazipfileinfo.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazipnewinfo.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/unzip.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/zip.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5_SharedTargets.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5_SharedTargets-none.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5Config.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5ConfigVersion.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/quazip1-qt5.pc
+make[2]: Leaving directory '/<<PKGBUILDDIR>>/build-shared'
+dh_auto_install -Bbuild-static --destdir=debian/tmp
+        cd build-static && make -j8 install DESTDIR=/<<PKGBUILDDIR>>/debian/tmp AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true"
+make[2]: Entering directory '/<<PKGBUILDDIR>>/build-static'
+/usr/bin/cmake -S/<<PKGBUILDDIR>> -B/<<PKGBUILDDIR>>/build-static --check-build-system CMakeFiles/Makefile.cmake 0
+make  -f CMakeFiles/Makefile2 preinstall
+make[3]: Entering directory '/<<PKGBUILDDIR>>/build-static'
+make[3]: Nothing to be done for 'preinstall'.
+make[3]: Leaving directory '/<<PKGBUILDDIR>>/build-static'
+Install the project...
+/usr/bin/cmake -P cmake_install.cmake
+-- Install configuration: "None"
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.a
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/JlCompress.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/ioapi.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/minizip_crypt.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quaadler32.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quachecksum32.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quacrc32.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quagzipfile.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quaziodevice.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazip.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazip_global.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazipfileinfo.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/quazipnewinfo.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/unzip.h
+-- Up-to-date: /<<PKGBUILDDIR>>/debian/tmp/usr/include/QuaZip-Qt5-1.1/quazip/zip.h
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5_StaticTargets.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5_StaticTargets-none.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5Config.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip-Qt5-1.1/QuaZip-Qt5ConfigVersion.cmake
+-- Installing: /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/quazip1-qt5.pc
+make[2]: Leaving directory '/<<PKGBUILDDIR>>/build-static'
+make[1]: Leaving directory '/<<PKGBUILDDIR>>'
+        rm -f debian/libquazip-doc.debhelper.log debian/libquazip5-1.debhelper.log debian/libquazip5-dev.debhelper.log
+   debian/rules override_dh_install
+make[1]: Entering directory '/<<PKGBUILDDIR>>'
+dh_install
+        install -d debian/.debhelper/generated/libquazip5-1
+        install -d debian/libquazip5-dev//usr/include
+        cp --reflink=auto -a debian/tmp/usr/include/QuaZip-Qt5-1.1 debian/libquazip5-dev//usr/include/
+        install -d debian/libquazip5-dev//usr/lib/x86_64-linux-gnu/pkgconfig
+        cp --reflink=auto -a debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/quazip1-qt5.pc debian/libquazip5-dev//usr/lib/x86_64-linux-gnu/pkgconfig/
+        install -d debian/.debhelper/generated/libquazip5-dev
+        install -d debian/.debhelper/generated/libquazip-doc
+d-shlibmove --commit \
+        --multiarch \
+        --devunversioned \
+        --exclude-la \
+        --movedev "debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/*.pc" "usr/lib/x86_64-linux-gnu/pkgconfig/" \
+        --movedev "debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip5/QuaZip5Config.cmake" "usr/share/quazip/" \
+        debian/tmp/usr/lib/*/*.so
+Library package automatic movement utility
+ --> qtdeclarative5-dev package exists.
+ --> zlib1g-dev package exists.
+set -e
+install -d -m 755 debian/libquazip1-qt5-dev/usr/lib/x86_64-linux-gnu
+install -d -m 755 debian/libquazip1-qt5-1.0.0/usr/lib/x86_64-linux-gnu
+mv debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.a debian/libquazip1-qt5-dev/usr/lib/x86_64-linux-gnu
+mv debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.so debian/libquazip1-qt5-dev/usr/lib/x86_64-linux-gnu
+mv /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.so.1.0.0 debian/libquazip1-qt5-1.0.0/usr/lib/x86_64-linux-gnu
+mv /<<PKGBUILDDIR>>/debian/tmp/usr/lib/x86_64-linux-gnu/libquazip1-qt5.so.1.1 debian/libquazip1-qt5-1.0.0/usr/lib/x86_64-linux-gnu
+PKGDEV=libquazip1-qt5-dev
+PKGSHL=libquazip1-qt5-1.0.0
+install -d -m 755 debian/libquazip1-qt5-dev/usr/lib/x86_64-linux-gnu/pkgconfig/
+mv debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/*.pc debian/libquazip1-qt5-dev/usr/lib/x86_64-linux-gnu/pkgconfig/
+install -d -m 755 debian/libquazip1-qt5-dev/usr/share/quazip/
+mv debian/tmp/usr/lib/x86_64-linux-gnu/cmake/QuaZip5/QuaZip5Config.cmake debian/libquazip1-qt5-dev/usr/share/quazip/
+E: line [Section: \(libs\|non-free/libs\)] not found in debian/control section for libquazip1-qt5-1.0.0
+E: line [Section: \(devel\|libdevel\|non-free/libdevel\)] not found in debian/control section for libquazip1-qt5-dev
+E: line [Depends:.*libquazip1-qt5-1.0.0] not found in debian/control section for libquazip1-qt5-dev
+E: line [Depends:.*[$]{shlibs:Depends}] not found in debian/control section for libquazip1-qt5-1.0.0


=====================================
debian/changelog
=====================================
@@ -2,8 +2,8 @@ libquazip (1.1-1) UNRELEASED; urgency=medium
 
   * New upstream version
   * override_dh_auto_test: Create test executable manually to pass test
-  TODO: static library
-
+  TODO: details in d/TODO
+  
  -- Andreas Tille <tille at debian.org>  Wed, 14 Oct 2020 15:34:26 +0200
 
 libquazip (0.9.1-1) unstable; urgency=medium


=====================================
debian/rules
=====================================
@@ -19,14 +19,20 @@ include /usr/share/dpkg/architecture.mk
 	dh $@ -buildsystem qmake
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	dh_auto_configure -Bbuild-shared -- \
 		-DBUILD_WITH_QT4=OFF \
 		-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+	dh_auto_configure -Bbuild-static -- \
+		-DBUILD_WITH_QT4=OFF \
+		-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+		-DBUILD_SHARED_LIBS=OFF
 	cp NEWS.txt NEWS
 
 override_dh_auto_build:
-	dh_auto_build
+	dh_auto_build -Bbuild-shared
+	dh_auto_build -Bbuild-static
 	# build doc
 	doxygen
 
@@ -42,20 +48,25 @@ override_dh_installdocs-indep:
 	dh_installdocs -i
 	find debian -name "*.md5" -delete
 
+override_dh_auto_install:
+	dh_auto_install -Bbuild-shared --destdir=debian/tmp
+
 override_dh_install:
 	dh_install
-	cp -a obj-*/libquazip5.a debian/tmp/usr/lib/*/
+	cp -a build-static/quazip/libquazip1-qt5.a debian/tmp/usr/lib/*/
 	d-shlibmove --commit \
 		--multiarch \
 		--devunversioned \
 		--exclude-la \
 		--movedev "debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc" "usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/" \
-		--movedev "debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/QuaZip5/QuaZip5Config.cmake" "usr/share/quazip/" \
+		--movedev "debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/QuaZip5/QuaZip5Config-*.cmake" "usr/share/quazip/" \
 		debian/tmp/usr/lib/*/*.so
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# somehow qztest executable is not build - do this manually here
-	cd obj-*/qztest && make
-	dh_auto_test
+	cd build-shared/qztest && make
+	cd build-static/qztest && make
+	dh_auto_test -Bbuild-shared
+	dh_auto_test -Bbuild-static
 endif



View it on GitLab: https://salsa.debian.org/med-team/libquazip/-/compare/8d84b22a0cd2b5ac67b3922787e3bff1eabc6561...25e102435f4e2b93c3a4b145f31b6eeb0dd8ecd6

-- 
View it on GitLab: https://salsa.debian.org/med-team/libquazip/-/compare/8d84b22a0cd2b5ac67b3922787e3bff1eabc6561...25e102435f4e2b93c3a4b145f31b6eeb0dd8ecd6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210516/4f5a84b3/attachment-0001.htm>

More information about the debian-med-commit mailing list