diff options
Diffstat (limited to 'meta-oe/recipes-support/onig/files')
-rw-r--r-- | meta-oe/recipes-support/onig/files/configure.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch | 44 |
2 files changed, 57 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch new file mode 100644 index 000000000..5fa700f19 --- /dev/null +++ b/meta-oe/recipes-support/onig/files/configure.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: onig-5.9.3/configure.in | ||
2 | =================================================================== | ||
3 | --- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 | ||
4 | +++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 | ||
5 | @@ -3,7 +3,7 @@ | ||
6 | |||
7 | AC_CONFIG_MACRO_DIR([m4]) | ||
8 | |||
9 | -AM_INIT_AUTOMAKE | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AC_CONFIG_HEADER(config.h) | ||
12 | |||
13 | |||
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 000000000..b93602a26 --- /dev/null +++ b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
2 | |||
3 | When build on host with older eglibc (Ubuntu 12.04) build fails with: | ||
4 | |||
5 | /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." | ||
6 | |||
7 | Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | --- | ||
12 | Makefile.am | 2 +- | ||
13 | sample/Makefile.am | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | --- onig-5.9.3.orig/Makefile.am | ||
17 | +++ onig-5.9.3/Makefile.am | ||
18 | @@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample | ||
19 | libname = libonig.la | ||
20 | |||
21 | ACLOCAL_AMFLAGS = -I m4 | ||
22 | #AM_CFLAGS = -DNOT_RUBY | ||
23 | AM_CFLAGS = | ||
24 | -INCLUDES = -I$(top_srcdir) -I$(includedir) | ||
25 | +INCLUDES = -I$(top_srcdir) | ||
26 | |||
27 | SUBDIRS = . sample | ||
28 | |||
29 | include_HEADERS = oniguruma.h oniggnu.h onigposix.h | ||
30 | lib_LTLIBRARIES = $(libname) | ||
31 | --- onig-5.9.3.orig/sample/Makefile.am | ||
32 | +++ onig-5.9.3/sample/Makefile.am | ||
33 | @@ -1,10 +1,10 @@ | ||
34 | noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl | ||
35 | |||
36 | libname = $(top_builddir)/libonig.la | ||
37 | LDADD = $(libname) | ||
38 | -INCLUDES = -I$(top_srcdir) -I$(includedir) | ||
39 | +INCLUDES = -I$(top_srcdir) | ||
40 | |||
41 | encode_SOURCES = encode.c | ||
42 | listcap_SOURCES = listcap.c | ||
43 | names_SOURCES = names.c | ||
44 | posix_SOURCES = posix.c | ||