Source: libprelude
Version: 4.1.0-4
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear maintainer,

there is an ongoing transition enabling python3.7 as a supported python3
version.  As of today the default has yet to change.

In ubuntu a patch was introduced to actually install the python3
extensions for all supported versions.

Additionally, a further patch was introcued to fix the build with
--as-needed in the linker options; this is not what this bug is about
but I figured I'd take the occasion to share it.


Please check out the attached patch, and consider doing an upload with
it soon so we can cleanly complete the transition.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diff -pruN 4.1.0-4/debian/changelog 4.1.0-4ubuntu2/debian/changelog
--- 4.1.0-4/debian/changelog	2018-03-11 18:53:39.000000000 +0000
+++ 4.1.0-4ubuntu2/debian/changelog	2018-07-26 02:52:09.000000000 +0000
@@ -1,3 +1,21 @@
+libprelude (4.1.0-4ubuntu2) cosmic; urgency=medium
+
+  * Install C extensions for all supported versions of Python 3.
+
+ -- Michael Hudson-Doyle <[email protected]>  Thu, 26 Jul 2018 14:52:09 +1200
+
+libprelude (4.1.0-4ubuntu1) cosmic; urgency=medium
+
+  * Fix ftbfs when --as-needed is the default. 
+
+ -- Michael Hudson-Doyle <[email protected]>  Wed, 25 Jul 2018 21:30:19 +1200
+
+libprelude (4.1.0-4build1) cosmic; urgency=medium
+
+  * No-change rebuild to build for python3.7.
+
+ -- Matthias Klose <[email protected]>  Thu, 28 Jun 2018 06:53:46 +0000
+
 libprelude (4.1.0-4) unstable; urgency=medium
 
   * Fix FTBFS with gcc-8: symbol mismatch (Closes: #892588)
diff -pruN 4.1.0-4/debian/control 4.1.0-4ubuntu2/debian/control
--- 4.1.0-4/debian/control	2018-03-11 18:53:39.000000000 +0000
+++ 4.1.0-4ubuntu2/debian/control	2018-07-25 10:00:30.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libprelude
 Priority: optional
 Section: libs
-Maintainer: Pierre Chifflier <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Pierre Chifflier <[email protected]>
 Uploaders: Thomas Andrejak <[email protected]>
 Build-Depends: debhelper (>= 11),
     dh-python <!nopython>,
diff -pruN 4.1.0-4/debian/patches/013-fix-test_rwlock1.patch 4.1.0-4ubuntu2/debian/patches/013-fix-test_rwlock1.patch
--- 4.1.0-4/debian/patches/013-fix-test_rwlock1.patch	1970-01-01 00:00:00.000000000 +0000
+++ 4.1.0-4ubuntu2/debian/patches/013-fix-test_rwlock1.patch	2018-07-25 09:30:13.000000000 +0000
@@ -0,0 +1,20 @@
+Description: Fix test-rwlock1 when --as-needed is the default.
+Author: Michael Hudson-Doyle <[email protected]>
+Forwarded: no
+Last-Update: 2018-07-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libmissing/tests/test-rwlock1.c
++++ b/libmissing/tests/test-rwlock1.c
+@@ -54,7 +54,10 @@
+ 
+ #define SUCCEED() exit (0)
+ #define FAILURE() exit (1)
+-#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d\n", n), abort ())
++/* The pointless reference to errno below is to ensure that the test binary
++ * gets a DT_NEEDED for libpthread even if the link is done with --as-needed
++ * (which is the default in Ubuntu) */
++#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d errno %d\n", n, errno), abort ())
+ 
+ /* The main thread creates the waiting writer and the requesting reader threads
+    in the default way; this guarantees that they have the same priority.
diff -pruN 4.1.0-4/debian/patches/series 4.1.0-4ubuntu2/debian/patches/series
--- 4.1.0-4/debian/patches/series	2018-03-02 13:50:15.000000000 +0000
+++ 4.1.0-4ubuntu2/debian/patches/series	2018-07-25 09:26:13.000000000 +0000
@@ -7,3 +7,4 @@
 010-fix_compatibility_gnutls_3_6.patch
 011-fix_spelling_error.patch
 012-fix-server_confirm_type.patch
+013-fix-test_rwlock1.patch
diff -pruN 4.1.0-4/debian/rules 4.1.0-4ubuntu2/debian/rules
--- 4.1.0-4/debian/rules	2017-08-29 11:46:35.000000000 +0000
+++ 4.1.0-4ubuntu2/debian/rules	2018-07-26 02:52:09.000000000 +0000
@@ -42,10 +42,15 @@ build-core:
 build-python%:
 	cd bindings/python && python$* setup.py build
 
-override_dh_auto_install:
+override_dh_auto_install: install-core $(PY2VERS:%=install-python%) $(PY3VERS:%=install-python%)
+
+install-core:
 	dh_auto_install
 	find . -name "*.la" -exec sed -i -e 's/^dependency_libs=.*$$/dependency_libs=/g' {} +
 
+install-python%:
+	cd bindings/python && python$* setup.py install --root $(CURDIR)/debian/tmp
+
 override_dh_python2:
 	dh_python2 -ppython-prelude
 

Attachment: signature.asc
Description: PGP signature

Reply via email to