Bug#995326: xrdp ftbfs on ppc64el and s390x
Package: xrdp
Version: 0.9.15-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu impish ubuntu-patch
Dear maintainers,
You are probably aware that xrdp is failing to build on s390x and ppc64el in
unstable. I took a look at this build failure and find that the cause is a
previously-existing warning now being promoted to an error due to the
compiler configuration.
The attached patch makes the package build again on ppc64el and s390x. I
have NOT verified that "NO_NEED_ALIGN" is correct for these architectures
for the structures in question; I have simply restored the package to build
on these architectures with the same configuration as before. Since no one
complained previously about xrdp crashing on these architectures, this is
likely sufficient at least for the time being. (An autopkgtest that tested
xrdp functionality at runtime would not be amiss!)
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slangasek@ubuntu.com vorlon@debian.org
diff -Nru xrdp-0.9.15/debian/patches/known-arch-list.diff xrdp-0.9.15/debian/patches/known-arch-list.diff
--- xrdp-0.9.15/debian/patches/known-arch-list.diff 1969-12-31 16:00:00.000000000 -0800
+++ xrdp-0.9.15/debian/patches/known-arch-list.diff 2021-09-29 10:29:28.000000000 -0700
@@ -0,0 +1,23 @@
+Description: fix build failure on ppc64el and s390x due to unknown arch
+ This package has failed to build on ppc64el and s390x because a previous
+ warning about "unknown arch" has now been promoted to an error.
+ Treat s390x and ppc64el as architectures that do not require alignment -
+ I am not certain this is correct for the code in question, but this was
+ the previous behavior and no one complained, so letting the package build
+ in this configuration without a warning is not a regression.
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Last-Update: 2021-09-29
+
+Index: xrdp-0.9.15/common/arch.h
+===================================================================
+--- xrdp-0.9.15.orig/common/arch.h
++++ xrdp-0.9.15/common/arch.h
+@@ -85,7 +85,7 @@
+ #elif defined(__x86__) || defined(__x86_64__) || \
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
+ defined(__i386__) || defined(__aarch64__) || \
+- defined(__riscv)
++ defined(__riscv) || defined(__powerpc64__) || defined(__s390x__)
+ #define NO_NEED_ALIGN
+ #else
+ #warning unknown arch
diff -Nru xrdp-0.9.15/debian/patches/series xrdp-0.9.15/debian/patches/series
--- xrdp-0.9.15/debian/patches/series 2021-03-01 13:26:39.000000000 -0800
+++ xrdp-0.9.15/debian/patches/series 2021-09-29 10:13:22.000000000 -0700
@@ -7,3 +7,4 @@
pulse-debian.patch
var-run.diff
document-certs.diff
+known-arch-list.diff
Reply to: