On Mon, 23 Feb 2015, Tom G. Christensen wrote:> On 19/02/15 23:21, Damien Miller wrote: > > Snapshot releases for portable OpenSSH are available from > > http://www.mindrot.org/openssh_snap/ > > > > I tried building openssh-SNAP-20150224.tar.gz on Solaris 2.6, 7, 8 and 9. > All failed because they do not have <sys/queue.h>. > Here's how it looks on Solaris 9/SPARC with gcc 4.9.2: > ... > In file included from ssh_api.c:21:0: > ssh_api.h:21:23: fatal error: sys/queue.h: No such file or directory > #include <sys/queue.h>Thanks - I just committed a fix: diff --git a/ssh_api.h b/ssh_api.h index a7e14e0..642acd5 100644 --- a/ssh_api.h +++ b/ssh_api.h @@ -18,10 +18,11 @@ #ifndef API_H #define API_H -#include <sys/queue.h> #include <sys/types.h> #include <signal.h> +#include "openbsd-compat/sys-queue.h" + #include "cipher.h" #include "sshkey.h" #include "kex.h"
On 23/02/15 20:31, Damien Miller wrote:> Thanks - I just committed a fix: ><snip patch> Thanks, unfortunately you missed the one in packet.h. In file included from ssh_api.h:31:0, from ssh_api.c:21: packet.h:38:23: fatal error: sys/queue.h: No such file or directory #include <sys/queue.h> ^ compilation terminated. gmake: *** [ssh_api.o] Error 1 Fixing that I run into the missing sig_atomic_t that I see you posted a patch for earlier. Next issue is unconditional include of <stdint.h> in xmalloc.c: xmalloc.c:19:20: error: stdint.h: No such file or directory Solaris < 10 does not have stdint.h, it actually only fails on Solaris 2.6 because it is limited to gcc 4.3.6 which does not provide a stdint.h replacement (this was introduced with gcc 4.4). -tgc
On Mon, 23 Feb 2015, Tom G. Christensen wrote:> On 23/02/15 20:31, Damien Miller wrote: > > Thanks - I just committed a fix: > > > <snip patch> > > Thanks, unfortunately you missed the one in packet.h. > > In file included from ssh_api.h:31:0, > from ssh_api.c:21: > packet.h:38:23: fatal error: sys/queue.h: No such file or directory > #include <sys/queue.h> > ^ > compilation terminated. > gmake: *** [ssh_api.o] Error 1 > > Fixing that I run into the missing sig_atomic_t that I see you posted a patch > for earlier. > > Next issue is unconditional include of <stdint.h> in xmalloc.c: > xmalloc.c:19:20: error: stdint.h: No such file or directory > > Solaris < 10 does not have stdint.h, it actually only fails on Solaris 2.6 > because it is limited to gcc 4.3.6 which does not provide a stdint.h > replacement (this was introduced with gcc 4.4).Thanks - I just committed fixes for both of these -d