ARM64 support

[incith]

Trying to get q2admin working on arm64. It compiles fine (after adding deps and updating makefile for it), but on load I'm getting an error that I can't seem to figure out. I understand arm might not be supported but figured there's the potential it could be an easy fix.

When I try and load the .so I'm getting this:

[2023-10-05 17:14] Execing server_map.cfg
[2023-10-05 17:14] Failed to load game library: /home/quake2/jump/q2admin-arm64-r398.so: undefined symbol: GSS_C_NT_HOSTBASED_SERVICE

[incith]

Ok this seems to be a deps issue. I resolved that by installing libgss-dev and including libgss.a / gss.pc and some gss headers.

Now I'm getting new unresolved symbols. I'll try and work out all the dependencies.

[incith]

So far I've needed libssh-dev, libgss-dev and libbrotli-dev and that's where I'm stuck now.

Can't figure out where this is coming from.

[2023-10-05 18:34] Execing server_map.cfg
[2023-10-05 18:34] Failed to load game library: /home/jordan/quake2/jump/q2admin-arm64-r398.so: undefined symbol: _kBrotliContextLookupTable

[incith]

Alright..I tried compiling brotli and various other things, I'm going to close this so I don't waste anyones time. I tried lol.

For the record this was on an orangepi zero 3 running ubuntu. q2pro compiles fine and runs the mods fine, just can't get past some of these errors and I'm just not good enough of a C programmer :)

[incith]

I got it! I had to update the deps with arm64 deps and add these libs to Makefile: (lssh or lssh2 (one is needed) and lz might not be needed but...I'm excited and posting)

        -lgss \
        -lssh2 \
        -lssh \
        -lbrotlidec \
        -lz \
        -lzstd \
        -lpsl \
        -lnghttp2 \
        -lldap

[2023-10-06 20:09] Execing server_map.cfg
[2023-10-06 20:09] Loaded game library from /home/jordan/quake2/jump/q2adminarm64.so
[2023-10-06 20:09] Q2Admin r398~0eed68b -> jump/gamearm64.so
[2023-10-06 20:09] ==== InitGame ====
[2023-10-06 20:09]
[2023-10-06 20:09] Opening users file!
[2023-10-06 20:09] -------------------------------------
[2023-10-06 20:09] 3511 map(s) loaded.
[2023-10-06 20:09] -------------------------------------
[2023-10-06 20:09] Opening users file!
[2023-10-06 20:09] in overide
[2023-10-06 20:09] Started: Download and Load remote user files...
[2023-10-06 20:09] Completed: Download and Load remote user files
[2023-10-06 20:09] -------------------------------------
[2023-10-06 20:09] No manual found in [manual] section of jump/manual.ini
[2023-10-06 20:09] -------------------------------------
[2023-10-06 20:09] WARNING: jump/q2a_login.cfg could not be found
[2023-10-06 20:09] WARNING: jump/q2a_bypass.cfg could not be found
[2023-10-06 20:09] libcurl/7.81.0 OpenSSL/3.0.2 zlib/1.2.11 brotli/1.0.9 zstd/1.4.8 libidn2/2.3.2 libpsl/0.21.0 (+libidn2/2.3.2) libssh/0.9.6/openssl/zlib nghttp2/1.43.0 librtmp/2.3 OpenLDAP/2.5.16 initialized.
[2023-10-06 20:09] Cloud Admin is disabled in your config.
[2023-10-06 20:09] ------- Server Initialization -------
[2023-10-06 20:09] SpawnServer: jumpish25
[2023-10-06 20:09] 0 entities inhibited
[2023-10-06 20:09] 0 teams with 0 entities
[2023-10-06 20:09] [ SERVERTIME (port 27920) : Fri Oct  6 20:09:03 2023 ]
[2023-10-06 20:09] -------------------------------------
[2023-10-06 20:09] MOTD Loaded
[2023-10-06 20:09] vote_enable = No
[2023-10-06 20:09] ====== Q2PRO initialized ======
[2023-10-06 20:09]
[2023-10-06 20:09] q2proded r2813~459e85b8, Oct  5 2023
[2023-10-06 20:09] https://github.com/skullernet/q2pro
[2023-10-06 20:09]

[incith]

Here's my git diff. Basically I copied the structure of deps/x86_64 and replaced all the files with ones from /usr/include/aarch64-linux-gnu and /usr/lib/aarch64-linux-gnu for anyone else who wants to try. (into deps/aarch64/)

lssh2 and lz were not needed.

diff --git a/Makefile b/Makefile
index 29629a3..01b23e9 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,16 @@ LIBS ?= deps/$(CPU)/curl/lib/libcurl.a \
         -lpthread \
         -ldl

+ifeq ($(CPU),aarch64)
+LIBS +=        -lgss \
+       -lssh \
+       -lbrotlidec \
+       -lzstd \
+       -lpsl \
+       -lnghttp2 \
+       -lldap
+endif
+
 ifdef CONFIG_WINDOWS
     CFLAGS += -DQ2ADMINCLIB=1
     CFLAGS += -Wno-unknown-pragmas

Here's a small script that could be expanded upon for making deps: (updated Oct. 8, only use on aarch64, will break x86_64)

#!/bin/sh
rm -rf `uname -p`

mkdir -p `uname -p`/curl/include/curl
mkdir -p `uname -p`/curl/lib/pkgconfig
cp /usr/include/`uname -p`-linux-gnu/curl/*.h `uname -p`/curl/include/curl/
cp /usr/lib/`uname -p`-linux-gnu/libcurl.a `uname -p`/curl/lib/
cp /usr/lib/`uname -p`-linux-gnu/pkgconfig/libcurl.pc `uname -p`/curl/lib/pkgconfig/

mkdir -p `uname -p`/openssl/include/openssl
mkdir -p `uname -p`/openssl/lib/pkgconfig
cp /usr/include/`uname -p`-linux-gnu/openssl/*.h `uname -p`/openssl/include/openssl/
cp /usr/include/openssl/*.h `uname -p`/openssl/include/openssl/
cp -r /usr/lib/ssl `uname -p`/openssl/
cp /usr/lib/`uname -p`-linux-gnu/libcrypto.a `uname -p`/openssl/lib/
cp /usr/lib/`uname -p`-linux-gnu/libssl.a `uname -p`/openssl/lib/
cp /usr/lib/`uname -p`-linux-gnu/pkgconfig/libcrypto.pc `uname -p`/openssl/lib/pkgconfig/
cp /usr/lib/`uname -p`-linux-gnu/pkgconfig/libssl.pc `uname -p`/openssl/lib/pkgconfig/
cp /usr/lib/`uname -p`-linux-gnu/pkgconfig/openssl.pc `uname -p`/openssl/lib/pkgconfig/

mkdir -p `uname -p`/zlib/include
mkdir -p `uname -p`/zlib/lib/pkgconfig
cp /usr/include/zlib.h `uname -p`/zlib/include/
cp /usr/include/zconf.h `uname -p`/zlib/include/
cp /usr/lib/`uname -p`-linux-gnu/libz.a `uname -p`/zlib/lib/
cp /usr/lib/`uname -p`-linux-gnu/pkgconfig/zlib.pc `uname -p`/zlib/lib/pkgconfig/

cp /usr/lib/`uname -p`-linux-gnu/libpthread.a `uname -p`