Re: Trouble compiling -current

["Valeriy E. Ushakov" <uwe%ptc.spbu.ru@localhost>]

On Sun, May 18, 2003 at 19:48:55 +0200, Torsten Harenberg wrote:

> Uppss.. sorry. You're right. Mixed it up with Linux. Too many computers 
> at the same time ;)
> 
> But this one here is real
> 
> 
> /usr/src/tools/obj/tools.NetBSD-1.6S-i386/bin/shle--netbsdelf-gcc 
> -ffreestanding  -O1 -Wno-parentheses -Werror -Wall -Wno-main 
> -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes 
> -Wstrict-prototypes -Wno-sign-compare -Wno-uninitialized  -Dhpcsh -I. 
> -I../../../../arch -I../../../.. -nostdinc -DDIAGNOSTIC -DDEBUG 
> -DMAXUSERS=32 -D_KERNEL -D_KERNEL_OPT   -c ../../../../dev/hpc/hpckbd.c
> In file included from ../../../../dev/hpc/hpckbd.c:68:
> ../../../../dev/hpc/hpckbdkeymap.h:818: 
> `platid_mask_MACH_HP_JORNADA_680EU' undeclared here (not in a function)
> ../../../../dev/hpc/hpckbdkeymap.h:818: initializer element is not constant
> ../../../../dev/hpc/hpckbdkeymap.h:818: (near initialization for 
> `hpckbd_keymap_table[4].ht_platform')
> ../../../../dev/hpc/hpckbdkeymap.h:823: 
> `platid_mask_MACH_HP_JORNADA_690EU' undeclared here (not in a function)
> ../../../../dev/hpc/hpckbdkeymap.h:823: initializer element is not constant
> ../../../../dev/hpc/hpckbdkeymap.h:823: (near initialization for 
> `hpckbd_keymap_table[5].ht_platform')
> *** Error code 1
> 
> Stop.
> nbmake: stopped in /usr/src/sys/arch/hpcsh/compile/jornada
> 
> Uwe: any ideas on that?

My turn to say "DOH!".  I committed this accidentally.  It should be
s/EU/HU/, of course.

Can you please test this patch

Index: hpckbdkeymap.h
===================================================================
RCS file: /cvsroot/src/sys/dev/hpc/hpckbdkeymap.h,v
retrieving revision 1.19
diff -u --unified -r1.19 hpckbdkeymap.h
--- hpckbdkeymap.h      2003/04/26 01:06:06     1.19
+++ hpckbdkeymap.h      2003/05/18 17:48:19
@@ -815,12 +815,12 @@
                CMDMAP(jornada6x0_us_keydesc),
                KB_US },
        /* European English (ABB) */
-       {       &platid_mask_MACH_HP_JORNADA_680EU,
+       {       &platid_mask_MACH_HP_JORNADA_680HU,
                jornada6x0_intl_keytrans,
                jornada6x0_special_keymap,
                CMDMAP(jornada6x0_intl_keydesc),
                KB_US },
-       {       &platid_mask_MACH_HP_JORNADA_690EU,
+       {       &platid_mask_MACH_HP_JORNADA_690HU,
                jornada6x0_intl_keytrans,
                jornada6x0_special_keymap,
                CMDMAP(jornada6x0_intl_keydesc),

I have changed platids in my tree, so, since you are compiling the
kernel anyway, you can test it faster and save me the trouble of
rolling back those changes. ;).

Sorry and thanks in advance.

SY, Uwe
-- 
uwe%ptc.spbu.ru@localhost                         |       Zu Grunde kommen
http://www.ptc.spbu.ru/~uwe/            |       Ist zu Grunde gehen