Patchwork [meta-oe] onig: do not use system headers

login
register
mail settings
Submitter Marcin Juszkiewicz
Date Feb. 20, 2013, 10:13 a.m.
Message ID <1361355187-7426-1-git-send-email-marcin.juszkiewicz@linaro.org>
Download mbox | patch
Permalink /patch/44919/
State Superseded, archived
Headers show

Comments

Marcin Juszkiewicz - Feb. 20, 2013, 10:13 a.m.
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>
---
 .../onig/files/do-not-use-system-headers.patch     | 44 ++++++++++++++++++++++
 meta-oe/recipes-support/onig/onig_5.9.3.bb         |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
Otavio Salvador - Feb. 20, 2013, 1:22 p.m.
On Wed, Feb 20, 2013 at 7:13 AM, Marcin Juszkiewicz
<marcin.juszkiewicz@linaro.org> wrote:
> 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>
> ---
>  .../onig/files/do-not-use-system-headers.patch     | 44 ++++++++++++++++++++++
>  meta-oe/recipes-support/onig/onig_5.9.3.bb         |  3 +-
>  2 files changed, 46 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
>
> 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 0000000..859446f
> --- /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: not valid (OE specific patch)

From the guidelines:

  Inappropriate [reason]
  - The patch is not appropriate for upstream, include a brief reason on the
    same line enclosed with []
    reason can be:
      not author (You are not the author and do not intend to upstream this,
                  source must be listed in the comments)
      native
      licensing
      configuration
      enable feature
      disable feature
      bugfix (add bug URL here)
      embedded specific
      no upstream (the upstream is no longer available -- dead project)
      other (give details in comments)

More at: http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

> +---
> + 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 230e585..f67ceed 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"
> --
> 1.8.1.2
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel



--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

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 0000000..859446f
--- /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: not valid (OE specific patch)
+
+---
+ 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 230e585..f67ceed 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"