[PATCH] Fix build error on GNU/K*BSD w/ChangeLog

Robert Millan zeratul2 at wanadoo.es
Mon Nov 17 14:11:52 CET 2003

[ Please CC, I'm not subscribed ]

On Sun, Nov 16, 2003 at 07:28:23PM -0500, David Shaw wrote:
> Unless I'm missing something, your patch causes K*BSD systems to match
> on the catchall value in config.links.  That is, no assembler modules
> at all.  Is that what you intended to do?  Do any of the existing
> configurations work for your platform?

"k*bsd*-gnu" systems should match the generic "i[3467]86*-*-*" rule below,
which is the same matched by "linux-gnu" systems without "aout" or "oldld"

However, by looking at it again I noticed my patch is wrong. I didn't carefuly
look at the *bsd* checks above, so my patch was somewhat redundant, and could
break for newer versions of bsdi*.

I'm attaching a revised version.


2003-11-17  Robert Millan  <robertmh at gnu.org>

	* config.links: Test for *BSD systems explicitly to avoid matching
	other K*BSD-based systems (e.g: GNU/KFreeBSD).

Robert Millan

"[..] but the delight and pride of Aule is in the deed of making, and in the
thing made, and neither in possession nor in his own mastery; wherefore he
gives and hoards not, and is free from care, passing ever on to some new work."

 -- J.R.R.T, Ainulindale (Silmarillion)
-------------- next part --------------
--- gnupg-1.2.3/mpi/config.links.old	2003-11-17 13:54:00.000000000 +0100
+++ gnupg-1.2.3/mpi/config.links	2003-11-17 13:58:11.000000000 +0100
@@ -67,7 +67,9 @@
     i[3467]86*-*-linuxaout*  | \
     i[3467]86*-*-linuxoldld* | \
-    i[3467]86*-*-*bsd*)
+    i[3467]86*-*-freebsd* | \
+    i[3467]86*-*-bsd*)
+# k*bsd*-gnu should _not_ match here
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
@@ -75,7 +77,9 @@
     i586*-*-linuxaout*  | \
     i586*-*-linuxoldld* | \
-    i586*-*-*bsd*)
+    i586*-*-freebsd* | \
+    i586*-*-bsd*)
+# k*bsd*-gnu should _not_ match here
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h

More information about the Gnupg-devel mailing list