diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/onig/files')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch | 13 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch | 44 |
2 files changed, 57 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch b/meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch new file mode 100644 index 000000000..5fa700f19 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch @@ -0,0 +1,13 @@ +Index: onig-5.9.3/configure.in +=================================================================== +--- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 ++++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 +@@ -3,7 +3,7 @@ + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_HEADER(config.h) + + diff --git a/meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch new file mode 100644 index 000000000..b93602a26 --- /dev/null +++ b/meta-openembedded/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 |