diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-support/onig | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/onig')
3 files changed, 76 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 diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb new file mode 100644 index 000000000..abbaf98c0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Regular expressions library. The characteristics of this \ +library is that different character encoding for every regular expression \ +object can be specified." +HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" + +SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ + file://do-not-use-system-headers.patch \ + file://configure.patch" + +SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830" +SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7" + +BINCONFIG = "${bindir}/onig-config" + +inherit autotools binconfig-disabled + +BBCLASSEXTEND = "native" |