Bug#995805: nx-libs: Add riscv64 support
Package: nx-libs
Version: 3.5.99.26-4
Severity: normal
Dear Maintainer,
* What led up to the situation?
nx-libs does not support riscv64 at the moment.
* What exactly did you do (or not do) that was effective (or
ineffective)?
Support for riscv64 was added and a PR was issued here (https://github.com/ArcticaProject/nx-libs/pull/1023): it has been a month, I think we can move on and apply directly the proposed patch that is attached.
-- System Information:
Debian Release: bullseye/sid
APT prefers hirsute-updates
APT policy: (500, 'hirsute-updates'), (500, 'hirsute-security'), (500, 'hirsute'), (100, 'hirsute-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.11.0-37-generic (SMP w/16 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru nx-libs-3.5.99.26/debian/changelog nx-libs-3.5.99.26/debian/changelog
--- nx-libs-3.5.99.26/debian/changelog 2021-09-12 13:06:17.000000000 +0200
+++ nx-libs-3.5.99.26/debian/changelog 2021-10-06 06:41:29.000000000 +0200
@@ -1,3 +1,10 @@
+nx-libs (2:3.5.99.26-5) unstable; urgency=medium
+
+ * debian/patches:
+ + Add support for riscv64 (LP: #1943129).
+
+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com> Wed, 06 Oct 2021 06:41:29 +0200
+
nx-libs (2:3.5.99.26-4) unstable; urgency=medium
* debian/patches:
diff -Nru nx-libs-3.5.99.26/debian/patches/riscv64_port.patch nx-libs-3.5.99.26/debian/patches/riscv64_port.patch
--- nx-libs-3.5.99.26/debian/patches/riscv64_port.patch 1970-01-01 01:00:00.000000000 +0100
+++ nx-libs-3.5.99.26/debian/patches/riscv64_port.patch 2021-10-06 06:40:49.000000000 +0200
@@ -0,0 +1,50 @@
+Description: Add riscv64 support
+Author: Alexandre Ghiti <alexandre.ghiti@canonical.com>
+Origin: other, https://github.com/ArcticaProject/nx-libs/pull/1023
+Bug: https://github.com/ArcticaProject/nx-libs/pull/1023
+Last-Update: 2021-10-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/nx-X11/config/cf/Imake.cf
++++ b/nx-X11/config/cf/Imake.cf
+@@ -843,6 +843,11 @@
+ # ifdef __aarch64__
+ # define Arm64Architecture
+ # endif
++# ifdef __riscv
++# if __riscv_xlen == 64
++# define Riscv64Architecture
++# endif
++# endif
+ # ifdef mc68000
+ # define Mc68020Architecture
+ # undef mc68000
+--- a/nx-X11/config/cf/Imake.tmpl
++++ b/nx-X11/config/cf/Imake.tmpl
+@@ -509,6 +509,8 @@
+ #define ByteOrder X_BIG_ENDIAN
+ #elif defined(Ppc64LeArchitecture)
+ #define ByteOrder X_LITTLE_ENDIAN
++#elif defined(Riscv64Architecture)
++#define ByteOrder X_LITTLE_ENDIAN
+ #elif defined(HPArchitecture)
+ #define ByteOrder X_BIG_ENDIAN
+ #elif defined(SuperHArchitecture)
+--- a/nx-X11/config/cf/linux.cf
++++ b/nx-X11/config/cf/linux.cf
+@@ -783,6 +783,15 @@
+ # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+ #endif /* PpcArchitecture */
+
++#ifdef Riscv64Architecture
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags -O3
++# endif
++# define LinuxMachineDefines -D__riscv64__
++# define ServerOSDefines XFree86ServerOSDefines
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* Riscv64Achitecture */
++
+ #ifdef s390Architecture
+ # ifndef OptimizedCDebugFlags
+ # define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
diff -Nru nx-libs-3.5.99.26/debian/patches/series nx-libs-3.5.99.26/debian/patches/series
--- nx-libs-3.5.99.26/debian/patches/series 2021-09-12 13:05:14.000000000 +0200
+++ nx-libs-3.5.99.26/debian/patches/series 2021-10-06 06:36:17.000000000 +0200
@@ -5,3 +5,4 @@
0003_randr-Do-not-update-ConnectionInfo-if-NULL.patch
0004_document-additional-options-only-nxagent-knows-about.patch
0005_fix-building-with-binutils-2.36.patch
+riscv64_port.patch
Reply to: