mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-21 05:57:05 +00:00
Code Issues Projects Releases Wiki Activity

lcdproc: Fix build on non-x86 and arm architectures

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-09-06 11:28:32 -07:00
parent c803bce22b
commit 44ab7f9991
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch
-7
View File
@@ -16,8 +16,6 @@ Signed-off-by: Harald Geyer <harald@ccbib.org>
clients/lcdproc/iface.h | 2 +- clients/lcdproc/iface.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
index 40e50cb7..1ac355bd 100644
--- a/clients/lcdproc/iface.c --- a/clients/lcdproc/iface.c
+++ b/clients/lcdproc/iface.c +++ b/clients/lcdproc/iface.c
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
@@ -28,8 +26,6 @@ index 40e50cb7..1ac355bd 100644
static int iface_count = 0; /* number of interfaces */ static int iface_count = 0; /* number of interfaces */
static char unit_label[10] = "B"; /* default unit label is Bytes */ static char unit_label[10] = "B"; /* default unit label is Bytes */
diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
index cc6dbaaf..c1bd6b5b 100644
--- a/clients/lcdproc/iface.h --- a/clients/lcdproc/iface.h
+++ b/clients/lcdproc/iface.h +++ b/clients/lcdproc/iface.h
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
@@ -41,6 +37,3 @@ index cc6dbaaf..c1bd6b5b 100644
/** Update screen content */ /** Update screen content */
int iface_screen(int rep, int display, int *flags_ptr); int iface_screen(int rep, int display, int *flags_ptr);
--
2.28.0
meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
+21 -7
View File
@@ -17,19 +17,33 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
server/drivers/port.h | 2 +- server/drivers/port.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/drivers/port.h b/server/drivers/port.h
index c584cd4e..bde235b3 100644
--- a/server/drivers/port.h --- a/server/drivers/port.h
+++ b/server/drivers/port.h +++ b/server/drivers/port.h
@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count); @@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns
/* ---------------------------- Linux ------------------------------------ */ /* ---------------------------- Linux ------------------------------------ */
/* Use ioperm, inb and outb in <sys/io.h> (Linux) */ /* Use ioperm, inb and outb in <sys/io.h> (Linux) */
/* And iopl for higher addresses of PCI LPT cards */ /* And iopl for higher addresses of PCI LPT cards */
-#if defined HAVE_IOPERM -#if defined HAVE_IOPERM
+#if defined(__GLIBC__) || (defined(__x86__) || defined(__x86_64__)) +#if HAVE_INB
/* Glibc2 and Glibc1 */ /* Glibc2 and Glibc1 */
# ifdef HAVE_SYS_IO_H # ifdef HAVE_SYS_IO_H
-- @@ -333,7 +333,7 @@ static inline int port_deny_multiple (un
2.24.1 return i386_set_ioperm(port, count, 0);
}
-#else
+#elif defined(__x86__) && defined(__x86_64__)
/* ------------------------- Everything else ----------------------------- */
/* Last chance! Use /dev/io and i386 ASM code (BSD4.3 ?) */
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ AC_CHECK_LIB(i386, i386_get_ioperm,
[])]
)
+AC_CHECK_FUNCS(inb)
AC_CHECK_FUNCS(iopl)
AC_CHECK_FUNCS(ioperm)
AC_CHECK_HEADERS(sys/io.h)