Package: libflint-2.5.2
Version: 2.5.2-19
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability
Control: affects -1 + src:sagemath src:singular
The affected packages fail to satisfy their cross Build-Depends, because
they need both the build architecture libflint-2.5.2 and the host
architecture libflint-2.5.2, but these conflict. Marking libflint-2.5.2
Multi-Arch: same would be needed here. Doing so requires moving the
library files to a multiarch libdir. The attached patch implements that.
Please consider applying it.
Helmut
diff --minimal -Nru flint-2.5.2/debian/changelog flint-2.5.2/debian/changelog
--- flint-2.5.2/debian/changelog 2018-11-04 00:44:41.000000000 +0100
+++ flint-2.5.2/debian/changelog 2019-09-07 13:06:37.000000000 +0200
@@ -1,3 +1,11 @@
+flint (2.5.2-19.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move libraries to a multiarch libdir.
+ * Mark libflint-2.5.2 Multi-Arch: same. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 07 Sep 2019 13:06:37 +0200
+
flint (2.5.2-19) unstable; urgency=medium
* Apply patch from H.Grohne to fix cross build (Closes: #912686)
diff --minimal -Nru flint-2.5.2/debian/control flint-2.5.2/debian/control
--- flint-2.5.2/debian/control 2018-11-04 00:44:41.000000000 +0100
+++ flint-2.5.2/debian/control 2019-09-07 13:06:37.000000000 +0200
@@ -12,6 +12,7 @@
Package: libflint-2.5.2
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libflint-1.06, libflint-2.4.4, libflint-2.4.5
Description: C library for number theory, shared library
diff --minimal -Nru flint-2.5.2/debian/libflint-2.5.2.install
flint-2.5.2/debian/libflint-2.5.2.install
--- flint-2.5.2/debian/libflint-2.5.2.install 2018-11-04 00:44:41.000000000
+0100
+++ flint-2.5.2/debian/libflint-2.5.2.install 2019-09-07 13:06:27.000000000
+0200
@@ -1,2 +1,2 @@
-/usr/lib/libflint-*.so.*
-/usr/lib/libflint-*.so
+/usr/lib/*/libflint-*.so.*
+/usr/lib/*/libflint-*.so
diff --minimal -Nru flint-2.5.2/debian/libflint-dev.install
flint-2.5.2/debian/libflint-dev.install
--- flint-2.5.2/debian/libflint-dev.install 2018-11-04 00:44:41.000000000
+0100
+++ flint-2.5.2/debian/libflint-dev.install 2019-09-07 13:06:35.000000000
+0200
@@ -1,3 +1,3 @@
/usr/include/flint
-/usr/lib/libflint.so
-/usr/lib/libflint.a
+/usr/lib/*/libflint.so
+/usr/lib/*/libflint.a
diff --minimal -Nru flint-2.5.2/debian/rules flint-2.5.2/debian/rules
--- flint-2.5.2/debian/rules 2018-11-04 00:44:41.000000000 +0100
+++ flint-2.5.2/debian/rules 2019-09-07 13:06:37.000000000 +0200
@@ -39,8 +39,8 @@
$(MAKE) -C doc/latex
override_dh_auto_install:
- dh_auto_install
- cd debian/tmp/usr/lib ; ln -sf libflint-$(DEB_VERSION_UPSTREAM).so.*
libflint-$(DEB_VERSION_UPSTREAM).so
+ dh_auto_install -- LIBDIR=lib/${DEB_HOST_MULTIARCH}
+ cd debian/tmp/usr/lib/${DEB_HOST_MULTIARCH} ; ln -sf
libflint-$(DEB_VERSION_UPSTREAM).so.* libflint-$(DEB_VERSION_UPSTREAM).so
override_dh_auto_test:
dh_auto_test -- $(MAKE_OVERRIDE)
