[DRE-maint] Bug#954293: ruby2.7: FTBFS on x32: misdetected as i386 or amd64

[Thorsten Glaser]

Control: tags -1 + patch

On Thu, 19 Mar 2020, Thorsten Glaser wrote:

> Please apply as patch, so we can test this on the buildd, and
> forward it upstream when it works.

Turns out this worked; I’ll upload to debian-ports unreleased so
the buildds can go on since…

> This is kinda important because libselinux build-depends on this.

Full debdiff and build log attached.

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg

**********

Mit der tarent Academy bieten wir auch Trainings und Schulungen in den
Bereichen Softwareentwicklung, Agiles Arbeiten und Zukunftstechnologien an.

Besuchen Sie uns auf www.tarent.de/academy. Wir freuen uns auf Ihren Kontakt.

**********
-------------- next part --------------
diff -Nru ruby2.7-2.7.0/debian/changelog ruby2.7-2.7.0/debian/changelog
--- ruby2.7-2.7.0/debian/changelog	2020-02-19 12:05:27.000000000 +0100
+++ ruby2.7-2.7.0/debian/changelog	2020-04-06 17:07:27.000000000 +0200
@@ -1,3 +1,10 @@
+ruby2.7 (2.7.0-4+x32.1) unreleased; urgency=high
+
+  * Non-maintainer upload.
+  * debian/patches/x32.diff: (Closes: #954293)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 06 Apr 2020 17:07:27 +0200
+
 ruby2.7 (2.7.0-4) unstable; urgency=medium
 
   * mipsel: exclude test that fails on buildd
diff -Nru ruby2.7-2.7.0/debian/patches/series ruby2.7-2.7.0/debian/patches/series
--- ruby2.7-2.7.0/debian/patches/series	2020-02-19 12:05:27.000000000 +0100
+++ ruby2.7-2.7.0/debian/patches/series	2020-04-06 17:06:27.000000000 +0200
@@ -6,3 +6,4 @@
 0006-Fix-FTBS-on-hurd.patch
 0007-Port-to-kfreebsd-amd64.patch
 0008-Fix-priority-order-of-paths-in-I-option.patch
+x32.diff
diff -Nru ruby2.7-2.7.0/debian/patches/x32.diff ruby2.7-2.7.0/debian/patches/x32.diff
--- ruby2.7-2.7.0/debian/patches/x32.diff	1970-01-01 01:00:00.000000000 +0100
+++ ruby2.7-2.7.0/debian/patches/x32.diff	2020-04-06 17:07:23.000000000 +0200
@@ -0,0 +1,14 @@
+# DP: see #954293
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2309,6 +2309,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
+         [x*64-darwin*], [
+             rb_cv_coroutine=amd64
+         ],
++	[x86_64-linux-gnux32], [
++		rb_cv_coroutine=ucontext
++	],
+         [x*64-linux*], [
+             AS_CASE(["$ac_cv_sizeof_voidp"],
+                 [8], [ rb_cv_coroutine=amd64 ],
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ruby2.7_2.7.0-4+x32.1_x32.build.xz
Type: application/x-xz
Size: 182904 bytes
Desc: 
URL: <http://alioth-lists.debian.net/pipermail/pkg-ruby-extras-maintainers/attachments/20200406/fce3f040/attachment-0001.xz>