ports/51066: converters/recode build failure

[Christian Weisgerber]

>Number:         51066
>Category:       ports
>Synopsis:       converters/recode build failure
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 16 11:40:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Christian Weisgerber
>Release:        FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Tue Apr 15 12:14:02 CEST 2003 naddy at kemoauc.mips.inka.de:/usr/obj/usr/src/sys/KEMOAUC alpha

>Description:

Since the addition of patch-lib-error.c, converters/recode does not build
any longer (at least) on -CURRENT/alpha:

cc -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I.  -I/usr/local/include  -O -pipe -mcpu=ev56 -mieee -c error.c
In file included from /usr/include/vm/pmap.h:86,
                 from error.c:33:
/usr/include/machine/pmap.h:103: syntax error before "pt_entry_t"
/usr/include/machine/pmap.h:103: warning: data definition has no type or storage class
/usr/include/machine/pmap.h:172: syntax error before "pt_entry_t"
/usr/include/machine/pmap.h:179: `MAXSMPCPU' undeclared here (not in a function)
*** Error code 1

Generally speaking, the inclusion of <machine/...> headers in this
place is highly dubious.  <machine/vmparam.h> and <machine/pmap.h>
are redundant anyway, since they are already included by the
corresponding <vm/...> headers.  <machine/param.h> needs to be
included earlier to fix the problem above, and should probably be
fetched indirectly through <sys/param.h>.

>How-To-Repeat:

>Fix:

Index: files/patch-lib-error.c
===================================================================
RCS file: /home/pcvs/ports/converters/recode/files/patch-lib-error.c,v
retrieving revision 1.1
diff -u -r1.1 patch-lib-error.c
--- files/patch-lib-error.c	23 Mar 2003 08:17:26 -0000	1.1
+++ files/patch-lib-error.c	16 Apr 2003 18:09:33 -0000
@@ -1,25 +1,23 @@
---- lib/error.c.orig	Mon Mar 10 10:57:22 2003
-+++ lib/error.c	Mon Mar 10 11:02:12 2003
-@@ -25,6 +25,18 @@
+--- lib/error.c.orig	Thu Aug  3 03:21:13 2000
++++ lib/error.c	Wed Apr 16 19:59:30 2003
+@@ -25,6 +25,16 @@
  # include <config.h>
  #endif
  
 +# ifdef __FreeBSD__
 +# include <sys/types.h>
 +# include <sys/exec.h>
++# include <sys/param.h>
 +# include <vm/vm.h>
 +# include <vm/vm_param.h>
 +# include <vm/pmap.h>
 +# include <vm/swap_pager.h>
-+# include <machine/param.h>
-+# include <machine/vmparam.h>
-+# include <machine/pmap.h>
 +# endif
 +
  #include <stdio.h>
  
  #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-@@ -80,7 +92,11 @@
+@@ -80,7 +90,11 @@
  
  /* The calling program should define program_name and set it to the
     name of the executing program.  */
>Release-Note:
>Audit-Trail:
>Unformatted: