Merge ~ahasenack/ubuntu/+source/uwsgi:disco-ftbfs-1820095 into ~ahasenack/ubuntu/+source/uwsgi:master

[Andreas Hasenack]

PPA with test builds: https://launchpad.net/~ahasenack/+archive/ubuntu/uwsgi-ftbfs-1820095

uwsgi is not imported into git-ubuntu, so this MP is against my own "master" branch which is the state of the package in disco.

gccgo recently[1] switched to pull in gccgo-9 instead of -8, and that breaks the uwsgi gccgo plugin build. The plugin looks for the "go1" in binary in gcc's (and cpp's) "/8/" directory, because that's where default gcc and cpp point at:

$ cpp -v 2>&1|grep /include
ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu"
ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/include"
 /usr/lib/gcc/x86_64-linux-gnu/8/include
 /usr/local/include
 /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed
 /usr/include/x86_64-linux-gnu
 /usr/include

$ dpkg -s cpp|grep Depends
Depends: cpp-8 (>= 8.3.0-1~)

Switching the whole build to use gcc-9 instead of -8 is a much bigger change that I'm not entertaining at this point. Telling uwsgi to use gccgo-8, which is what it used before, is a much safer option and the right thing to do now in feature freeze.

I'm also dropping the libqdbm-dev build dependency for reasons explained in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=924586. We can keep it if you think it's a risky change. The runtime packages don't get such a dependency anyway and it shouldn't block the mailman3 mir.

1. https://launchpad.net/ubuntu/+source/gcc-defaults/1.181ubuntu2

[Christian Ehrhardt  (paelzer)]

Ack to "Switching the whole build to use gcc-9 instead of -8 is a much bigger change that I'm not entertaining at this point. Telling uwsgi to use gccgo-8, which is what it used before, is a much safer option and the right thing to do now in feature freeze."

let me check the details ...

[Christian Ehrhardt  (paelzer)]

I think the qdbm change is fine and since we add Delta anyway it is fine to be added.
It can be re-evaluated when we merge it next time then - seems fine to me.

[Christian Ehrhardt  (paelzer)]

This will start to break once gccgo-8 goes away.
But that is fine, before that happens we want to merge a version that hopefulyl is gcc-9 compatible anyway.

[Christian Ehrhardt  (paelzer)]

After a short tour wondering about x86 only builds I'm concluding that this change is good - thanks.
+1

review: Approve

[Andreas Hasenack (ahasenack)]

Uploaded, no tag as it's not in git-ubuntu:

$ dput ubuntu ../uwsgi_2.0.18-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../uwsgi_2.0.18-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../uwsgi_2.0.18-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading uwsgi_2.0.18-1ubuntu1.dsc: done.
  Uploading uwsgi_2.0.18-1ubuntu1.debian.tar.xz: done.
  Uploading uwsgi_2.0.18-1ubuntu1_source.buildinfo: done.
  Uploading uwsgi_2.0.18-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index bc7ac13..1b85ead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+uwsgi (2.0.18-1ubuntu1) disco; urgency=medium
+
+  * d/control, d/control.in: update Build-Depends to pull in gccgo-8
+    explicitly, as gccgo now pulls in gccgo-9 (LP: #1820095)
+  * d/control, d/control.in: drop build-depends on libqdbm-dev, seems
+    unused (Closes: #924586)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 20 Mar 2019 13:51:49 +0000
+
 uwsgi (2.0.18-1) unstable; urgency=medium
 
   [ upstream ]
diff --git a/debian/control b/debian/control
index 06bb826..da2e82e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: uwsgi
 Section: httpd
 Priority: optional
-Maintainer: uWSGI packaging team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: uWSGI packaging team <[e-mail]>
 Uploaders:
  Jonas Smedegaard <[e-mail]>,
  Thomas Goirand <[e-mail]>,
@@ -24,7 +25,7 @@ Build-Depends:
  apache2-dev | apache2-threaded-dev,
  cli-common-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel ppc64el s390x],
  dh-apache2 | apache2-dev,
- gccgo [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x],
+ gccgo-8 [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x],
  glusterfs-common [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x],
  help2man,
  java-common,
@@ -47,7 +48,6 @@ Build-Depends:
  libpam0g-dev,
  libperl-dev,
  libpq-dev,
- libqdbm-dev,
  librados-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x],
  libsqlite3-dev,
  libsystemd-dev [!kfreebsd-any !hurd-any] | libsystemd-journal-dev [!kfreebsd-any !hurd-any],
diff --git a/debian/control.in b/debian/control.in
index 997b590..b61ceaa 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: uwsgi
 Section: httpd
 Priority: optional
-Maintainer: uWSGI packaging team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: uWSGI packaging team <[e-mail]>
 Uploaders:
  Jonas Smedegaard <[e-mail]>,
  Thomas Goirand <[e-mail]>,
@@ -12,7 +13,7 @@ Build-Depends:
  apache2-dev | apache2-threaded-dev,
  cli-common-dev [@mono_archs@],
  dh-apache2 | apache2-dev,
- gccgo [@gccgo_archs@],
+ gccgo-8 [@gccgo_archs@],
  glusterfs-common [@glusterfs_archs@],
  help2man,
  java-common,
@@ -35,7 +36,6 @@ Build-Depends:
  libpam0g-dev,
  libperl-dev,
  libpq-dev,
- libqdbm-dev,
  librados-dev [@rados_archs@],
  libsqlite3-dev,
  libsystemd-dev [!kfreebsd-any !hurd-any] | libsystemd-journal-dev [!kfreebsd-any !hurd-any],