CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbset: Fix out of tree builds ( S != B )

Browse Source 
Remove assumption about glibc == linux

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2016-01-20 05:03:09 +00:00 committed by Martin Jansa
parent 9cf9d864d5
commit 484fbf6979
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch Normal file
View File

@ -0,0 +1,34 @@
From 06edd88833da93361d5408b880fbb890df332497 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 19 Jan 2016 01:55:47 +0000
Subject: [PATCH] fbset: including asm/types.h is needed on all linux systems
including asm/types.h is needed to get Linux typedef's like
__s32 and so on which are independent of C library therefore this
define should not be guarded by __GLIBC__ but by __linux__
Helps to compile it on musl systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
fbset.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fbset.h b/fbset.h
index 9b1d2ac..0d8def8 100644
--- a/fbset.h
+++ b/fbset.h
@@ -15,7 +15,7 @@
#include <stdio.h>
#include <sys/types.h>
-#ifdef __GLIBC__
+#ifdef __linux__
#include <asm/types.h>
#endif
--
2.7.0

7
meta-oe/recipes-support/fbset/fbset_2.1.bb
View File

@ -16,15 +16,16 @@ PR = "r4"
SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \
file://makefile.patch \
file://fbset-2.1-fix-makefile-dep.patch \
file://0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch \
"
inherit update-alternatives
do_install() {
install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5
install -m 0755 ${WORKDIR}/${BP}/fbset ${D}${sbindir}/fbset.real
install -m 0644 ${WORKDIR}/${BP}/*.5 ${D}${datadir}/man/man5
install -m 0644 ${WORKDIR}/${BP}/*.8 ${D}${datadir}/man/man8
install -m 0755 ${B}/fbset ${D}${sbindir}/fbset.real
install -m 0644 ${B}/*.5 ${D}${datadir}/man/man5
install -m 0644 ${B}/*.8 ${D}${datadir}/man/man8
}
ALTERNATIVE_fbset = "fbset"