Re: CVS commit: src/sys/compat/netbsd32

[Paul Goyette <paul%whooppee.com@localhost>]

The following patch seems to take care of things, at least on my amd64 
machine.  I'm not sure if this is the correct fix, so I will let someone 
else handle the commit!


Index: netbsd32_sa.c
===================================================================
RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_sa.c,v
retrieving revision 1.12
diff -u -p -r1.12 netbsd32_sa.c
--- netbsd32_sa.c       4 Jan 2011 10:59:28 -0000       1.12
+++ netbsd32_sa.c       4 Jan 2011 13:56:08 -0000
@@ -34,8 +34,11 @@

 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: netbsd32_sa.c,v 1.12 2011/01/04 10:59:28 
matt Exp $");
+
+#if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #include "opt_sa.h"
+#endif

 #include <sys/types.h>
 #include <sys/param.h>



On Tue, 4 Jan 2011, Paul Goyette wrote:

> On Tue, 4 Jan 2011, Matt Thomas wrote:
>
> > Module Name:    src
> > Committed By:   matt
> > Date:           Tue Jan  4 10:59:29 UTC 2011
> >
> > Modified Files:
> >         src/sys/compat/netbsd32: files.netbsd32 netbsd32_sa.c
> >
> > Log Message:
> > Make the SA support as optional as is possible.
>
> This commit appears to have broken the build, at least on port-amd64:
>
> #    create  compat_netbsd32/netbsd32_sa.d
> CC=/test-bed/tools/bin/x86_64--netbsd-gcc /test-bed/tools/bin/nbmkdep -f 
> netbsd32_sa.d --      -I/test-bed/src/common/include -DSYSVSHM -DSYSVSEM 
> -DSYSVMSG -DCOMPAT_NETBSD32 -DEXEC_ELF32 -DEXEC_ELF64 -DEXEC_AOUT 
> -DP1003_1B_SEMAPHORE -DCOREDUMP -I/test-bed/src/common/include  -nostdinc -I. 
> -I/test-bed/src/sys/modules/compat_netbsd32 -isystem /test-bed/src/sys 
> -isystem /test-bed/src/sys/arch -isystem /test-bed/src/sys/../common/include 
> -D_KERNEL -D_LKM -D_MODULE -std=gnu99 
> /test-bed/src/sys/compat/netbsd32/netbsd32_sa.c
> /test-bed/src/sys/compat/netbsd32/netbsd32_sa.c:37:31: error: 
> opt_compat_netbsd.h: No such file or directory
> /test-bed/src/sys/compat/netbsd32/netbsd32_sa.c:38:20: error: opt_sa.h: No 
> such file or directory
> nbmkdep: compile failed.
>
>
>
>
> -------------------------------------------------------------------------
> | Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
> | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
> | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
> | Kernel Developer |                          | pgoyette at netbsd.org  |
> -------------------------------------------------------------------------

-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------