mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
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>
This commit is contained in:
committed by
Martin Jansa
parent
b4a6fdcd39
commit
7d0967c441
@@ -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
|
||||||
@@ -5,7 +5,8 @@ HOMEPAGE = "http://www.geocities.jp/kosako3/oniguruma/"
|
|||||||
LICENSE = "BSD"
|
LICENSE = "BSD"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f"
|
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[md5sum] = "0d4eda2066d3c92970842a6790ce897a"
|
||||||
SRC_URI[sha256sum] = "c3bba66b2a84760e6582c40881db97c839d94f327870009724bb8b4d0c051f2a"
|
SRC_URI[sha256sum] = "c3bba66b2a84760e6582c40881db97c839d94f327870009724bb8b4d0c051f2a"
|
||||||
|
|||||||
Reference in New Issue
Block a user