lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [PATCHv4] speakup: Generate speakupmap.h automatically
Date
Hi,
I was building 6.0-rc1 and this patch seem to cause some compiling
issues. The u_char was not defined in my host build environment (I
suspect because of the musl based host) which leads to the makemapdata
failing to compile. Changing the file to use "unsigned char" seems to
solve the issue.

After that I also had some weird issues of the build system trying to
write speakupmap.h into the source dir and not the output dir (the
source is read only due to the tooling I use) but this seems to have
been resolved by cleanly rebuilding the speakup dir.

A patch changing the type follows.

Nikita

-- >8 --
From bc239d8740f9e31240e8727f76227daa1aec3c4f Mon Sep 17 00:00:00 2001
From: Nikita Travkin <nikita@trvn.ru>
Date: Tue, 16 Aug 2022 11:39:52 +0500
Subject: [PATCH] speakup: Fix compilation in some build environments

A compilation error may occur if the host CC doesn't have u_char
defined:

HOSTCC drivers/accessibility/speakup/makemapdata.o
In file included from ../drivers/accessibility/speakup/makemapdata.c:15:
../drivers/accessibility/speakup/utils.h: In function 'hash_name':
../drivers/accessibility/speakup/utils.h:57:9: error: unknown type name 'u_char'; did you mean 'char'?
57 | u_char *pn = (u_char *)name;
| ^~~~~~
| char

Fix this by using "unsigned char" instead.

Fixes: 6a5c94d92699 ("speakup: Generate speakupmap.h automatically")
Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
drivers/accessibility/speakup/utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/accessibility/speakup/utils.h b/drivers/accessibility/speakup/utils.h
index 4bf2ee8ac246..4ce9a12f7664 100644
--- a/drivers/accessibility/speakup/utils.h
+++ b/drivers/accessibility/speakup/utils.h
@@ -54,7 +54,7 @@ static inline int oops(const char *msg, const char *info)

static inline struct st_key *hash_name(char *name)
{
- u_char *pn = (u_char *)name;
+ unsigned char *pn = (unsigned char *)name;
int hash = 0;

while (*pn) {
--
2.35.3
\
 
 \ /
  Last update: 2022-08-16 11:16    [W:0.057 / U:0.916 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site