Errors compiling 1.2.4 on OpenBSD 3.4

[David Shaw]

On Mon, Dec 29, 2003 at 11:06:12PM +0100, Richard Cattien wrote:
> Hi,
> 
> On Mon, Dec 29, 2003 at 04:37:43PM -0500, David Shaw wrote:
> > > this worked flawlessly! What did you change?
> > 
> > I disabled the special OpenBSD assembler handling.  It looks like
> > OpenBSD doesn't need it any more.
> > 
> > I'd appreciate it if anyone with an OpenBSD 3.3, 3.2, 3.1, or 3.0 box
> > could try the same patch and see what happens.  I'm not sure when
> > OpenBSD changed things, so it's difficult to write a proper fix for
> > the next version of GnuPG.
> 
> I tried it on my gateway which still runs OpenBSD 3.3. Well, it didn't
> work out. A lot of undefined symbols ...
> 
> So it seems that OpenBSD changed its assembler handling with 3.4

Okay, try this new patch.   Remember to re-"./configure", and "make
clean" after patching.  Ideally, it should work properly on both 3.3
and 3.4 (and previous versions as well).

Any OpenBSD users who can try this on different versions of OpenBSD
would be much appreciated.

David
-------------- next part --------------
Index: config.links
===================================================================
RCS file: /cvs/gnupg/gnupg/mpi/config.links,v
retrieving revision 1.30.2.6
diff -u -r1.30.2.6 config.links
--- config.links	2 Dec 2003 05:13:35 -0000	1.30.2.6
+++ config.links	29 Dec 2003 22:32:25 -0000
@@ -62,13 +62,20 @@
        cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
        path="i386"
        ;;
-# Use old assembler syntax for OpenBSD as their assembler is really old.
-    i[34567]86*-*-openbsd*)
+# Use old assembler syntax for old OpenBSDs as their assembler is really old.
+    i[34567]86*-*-openbsd[12]* | \
+    i[34567]86*-*-openbsd3.[0123]*)
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386-openbsd/syntax.h	    >>./mpi/asm-syntax.h
 	path="i386-openbsd"
 	;;
+# If we didn't match the previous rule, it's an ELF OpenBSD
+    i[34567]86*-*-openbsd*)
+       echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+       cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
+       path="i386"
+       ;;
     i[3467]86*-*-linuxaout*  | \
     i[3467]86*-*-linuxoldld* | \
     i[3467]86*-*-*bsd*)