[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#991547: unblock: spirv-tools/2020.6-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: smcv@debian.org, spirv-tools@packages.debian.org

Please unblock package spirv-tools

(Please provide enough (but not too much) information to help
the release team to judge the request efficiently. E.g. by
filling in the sections below.)

[ Reason ]
Fixes bug 980370, and while it would be more correct to package the lib as a normal shared lib it's not possible right now until upstream has fixed it to be a proper versioned library. That'll take time, so the lib was dropped instead.

[ Impact ]
The package should not provide a shared library, since it's unversioned. This was supposed to be dropped earlier, but the build system is buggy so the library was still shipped.

[ Tests ]
It was speculated that mojoshader might fail to build after dropping the lib, but it still builds:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/mojoshader.html

[ Risks ]
The change is trivial, and it was shown not to break a package build that was thought 

[ Checklist ]
  [ x ] all changes are documented in the d/changelog
  [ x ] I reviewed all changes and I approve them
  [ x ] attach debdiff against the package in testing

[ Other info ]

unblock spirv-tools/2020.6-2
diff -Nru spirv-tools-2020.6/debian/changelog spirv-tools-2020.6/debian/changelog
--- spirv-tools-2020.6/debian/changelog	2020-12-09 00:07:00.000000000 +0200
+++ spirv-tools-2020.6/debian/changelog	2021-07-21 10:15:48.000000000 +0300
@@ -1,3 +1,11 @@
+spirv-tools (2020.6-2) unstable; urgency=medium
+
+  * rules: Really build for the static library, and make sure shared one
+    is removed since it's still created despite the config options.
+    (Closes: #980370)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 21 Jul 2021 10:15:48 +0300
+
 spirv-tools (2020.6-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #975164)
diff -Nru spirv-tools-2020.6/debian/rules spirv-tools-2020.6/debian/rules
--- spirv-tools-2020.6/debian/rules	2020-12-08 23:23:48.000000000 +0200
+++ spirv-tools-2020.6/debian/rules	2021-07-21 10:05:07.000000000 +0300
@@ -7,10 +7,18 @@
 	dh_auto_configure -- \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DSPIRV-Headers_SOURCE_DIR=/usr \
-		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_SHARED_LIBS=OFF \
+		-DSPIRV_TOOLS_BUILD_STATIC=ON \
+		-DSPIRV_TOOLS_LIBRARY_TYPE=STATIC
 
 override_dh_auto_test:
 
+override_dh_install:
+	dh_install
+	rm debian/spirv-tools/usr/lib/*/pkgconfig/SPIRV-Tools-shared.pc
+	rm debian/spirv-tools/usr/lib/*/libSPIRV-Tools-shared.so
+
+
 gentarball: SOURCE=spirv-tools
 gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//')
 gentarball:

Reply to: