On Wed, Jan 20, 2016 at 05:03:09AM +0000, Khem Raj wrote: > Remove assumption about glibc == linux > > Signed-off-by: Khem Raj <[email protected]> > --- > ...ding-asm-types.h-is-needed-on-all-linux-s.patch | 34 > ++++++++++++++++++++++ > meta-oe/recipes-support/fbset/fbset_2.1.bb | 9 +++--- > 2 files changed, 39 insertions(+), 4 deletions(-) > create mode 100644 > meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch > > diff --git > a/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch > > b/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch > new file mode 100644 > index 0000000..7f45dbe > --- /dev/null > +++ > b/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch > @@ -0,0 +1,34 @@ > +From 06edd88833da93361d5408b880fbb890df332497 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <[email protected]> > +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 <[email protected]> > +--- > +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 > + > diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb > b/meta-oe/recipes-support/fbset/fbset_2.1.bb > index 1855932..ce49019 100644 > --- a/meta-oe/recipes-support/fbset/fbset_2.1.bb > +++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb > @@ -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 \ > + "
I've removed closing quote indentation change, because it should be
first character on separate line (according to our styleguide).
>
> 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"
> --
> 2.7.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> [email protected]
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
