Skip to content

Commit

Permalink
aarch64: fix openssh aarch64 cross-build
Browse files Browse the repository at this point in the history
  • Loading branch information
hadfl committed Dec 14, 2024
1 parent ee0b993 commit 64a098c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build/openssh/patches/0013-Solaris-Auditing-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/INSTALL a/INSTALL
diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile.in a/Makefile.in
--- a~/Makefile.in 1970-01-01 00:00:00
+++ a/Makefile.in 1970-01-01 00:00:00
@@ -128,7 +128,7 @@ SSHDOBJS=sshd.o \
@@ -127,7 +127,7 @@ SSHDOBJS=sshd.o \
$(SKOBJS)

SSHD_SESSION_OBJS=sshd-session.o auth-rhosts.o auth-passwd.o \
Expand Down
19 changes: 19 additions & 0 deletions build/openssh/patches/gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/audit-solaris.c a/audit-solaris.c
--- a~/audit-solaris.c 1970-01-01 00:00:00
+++ a/audit-solaris.c 1970-01-01 00:00:00
@@ -37,6 +37,7 @@
#include <errno.h>
#include <pwd.h>
#include <string.h>
+#include <unistd.h>

#include <bsm/adt.h>
#include <bsm/adt_event.h>
@@ -49,7 +50,6 @@
#include <errno.h>
#include <pwd.h>
#include <stdio.h>
-#include <unistd.h>
#include <stdarg.h>
#include <string.h>
#include <ucred.h>
2 changes: 2 additions & 0 deletions build/openssh/patches/series.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ sshd_config.patch
0029-Accept-LANG-and-LC_-environment-variables-from-clien.patch
0031-Restore-tcpwrappers-libwrap-support.patch
test.patch
pam-illumos.patch
gcc14.patch

0 comments on commit 64a098c

Please sign in to comment.