diff options
| author |   Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-02-21 12:31:35 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-13 17:21:53 +0100 |
| commit | 7d0967c4412a80272825cdf410057d9fd195920d (patch) | |
| tree | da1dba03516334657e60dd86d6c7209cfae23fa0 /meta-oe/recipes-support/onig | |
| parent | b4a6fdcd3907d02cf6d8bdf16acfdda26d245039 (diff) | |
| download | meta-openembedded-contrib-7d0967c4412a80272825cdf410057d9fd195920d.tar.gz | |
onig: do not use system headers
When build on host with older eglibc (Ubuntu 12.04) build fails with:
/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead."
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/onig')
| -rw-r--r-- | meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch | 44 | ||||
| -rw-r--r-- | meta-oe/recipes-support/onig/onig_5.9.3.bb | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch new file mode 100644 index 0000000000..b93602a268 --- /dev/null +++ b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch @@ -0,0 +1,44 @@ +Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + +When build on host with older eglibc (Ubuntu 12.04) build fails with: + +/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead." + +Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + +Upstream-Status: Inappropriate [embedded specific] + +--- + Makefile.am | 2 +- + sample/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- onig-5.9.3.orig/Makefile.am ++++ onig-5.9.3/Makefile.am +@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample + libname = libonig.la + + ACLOCAL_AMFLAGS = -I m4 + #AM_CFLAGS = -DNOT_RUBY + AM_CFLAGS = +-INCLUDES = -I$(top_srcdir) -I$(includedir) ++INCLUDES = -I$(top_srcdir) + + SUBDIRS = . sample + + include_HEADERS = oniguruma.h oniggnu.h onigposix.h + lib_LTLIBRARIES = $(libname) +--- onig-5.9.3.orig/sample/Makefile.am ++++ onig-5.9.3/sample/Makefile.am +@@ -1,10 +1,10 @@ + noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl + + libname = $(top_builddir)/libonig.la + LDADD = $(libname) +-INCLUDES = -I$(top_srcdir) -I$(includedir) ++INCLUDES = -I$(top_srcdir) + + encode_SOURCES = encode.c + listcap_SOURCES = listcap.c + names_SOURCES = names.c + posix_SOURCES = posix.c diff --git a/meta-oe/recipes-support/onig/onig_5.9.3.bb b/meta-oe/recipes-support/onig/onig_5.9.3.bb index 230e585745..f67ceede67 100644 --- a/meta-oe/recipes-support/onig/onig_5.9.3.bb +++ b/meta-oe/recipes-support/onig/onig_5.9.3.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://www.geocities.jp/kosako3/oniguruma/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" -SRC_URI = "http://www.geocities.jp/kosako3/oniguruma/archive/onig-${PV}.tar.gz" +SRC_URI = "http://www.geocities.jp/kosako3/oniguruma/archive/onig-${PV}.tar.gz \ + file://do-not-use-system-headers.patch" SRC_URI[md5sum] = "0d4eda2066d3c92970842a6790ce897a" SRC_URI[sha256sum] = "c3bba66b2a84760e6582c40881db97c839d94f327870009724bb8b4d0c051f2a" |