Patchwork [meta-java] llvm2.8: fix llvm compile error by including unistd.h

login
mail settings
Submitter Jan Luebbe
Date May 15, 2012, 9:56 a.m.
Message ID <1337075762-8696-1-git-send-email-jlu@pengutronix.de>
Download mbox | patch
Permalink /patch/27767/
State Accepted
Headers show

Comments

Jan Luebbe - May 15, 2012, 9:56 a.m.
Thanks to Jaap de Jong and Khem Raj for reporing the problem and suggesting the fix.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 recipes-core/llvm/llvm2.8/add-unistd.patch |   12 ++++++++++++
 recipes-core/llvm/llvm2.8_2.8.bb           |    3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 recipes-core/llvm/llvm2.8/add-unistd.patch
Henning Heinold - June 1, 2012, 7:44 a.m.
On Tue, May 15, 2012 at 11:56:02AM +0200, Jan Luebbe wrote:
> Thanks to Jaap de Jong and Khem Raj for reporing the problem and suggesting the fix.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> ---
>  recipes-core/llvm/llvm2.8/add-unistd.patch |   12 ++++++++++++
>  recipes-core/llvm/llvm2.8_2.8.bb           |    3 +++
>  2 files changed, 15 insertions(+)
>  create mode 100644 recipes-core/llvm/llvm2.8/add-unistd.patch
> 
> diff --git a/recipes-core/llvm/llvm2.8/add-unistd.patch b/recipes-core/llvm/llvm2.8/add-unistd.patch
> new file mode 100644
> index 0000000..1c51b30
> --- /dev/null
> +++ b/recipes-core/llvm/llvm2.8/add-unistd.patch
> @@ -0,0 +1,12 @@
> +Index: llvm-2.8/lib/ExecutionEngine/JIT/Intercept.cpp
> +===================================================================
> +--- llvm-2.8.orig/lib/ExecutionEngine/JIT/Intercept.cpp	2012-05-14 18:31:21.008318473 +0200
> ++++ llvm-2.8/lib/ExecutionEngine/JIT/Intercept.cpp	2012-05-14 18:32:53.523734850 +0200
> +@@ -19,6 +19,7 @@
> + #include "llvm/Support/ErrorHandling.h"
> + #include "llvm/System/DynamicLibrary.h"
> + #include "llvm/Config/config.h"
> ++#include <unistd.h>
> + using namespace llvm;
> + 
> + // AtExitHandlers - List of functions to call when the program exits,
> diff --git a/recipes-core/llvm/llvm2.8_2.8.bb b/recipes-core/llvm/llvm2.8_2.8.bb
> index 310e94e..3459885 100644
> --- a/recipes-core/llvm/llvm2.8_2.8.bb
> +++ b/recipes-core/llvm/llvm2.8_2.8.bb
> @@ -4,9 +4,12 @@ require llvm.inc
>  LICENSE = "NCSA"
>  LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855"
>  
> +PR = "r1"
> +
>  SRC_URI += " \
>              file://30may-llvm2.8-pr399-ppc-arm.patch \
>              file://0019-issue6065.patch \
> +            file://add-unistd.patch \
>             "
>  
>  SRC_URI_append_arm = " file://llvm-mc_disable.patch "
> -- 
> 1.7.10

Thanks for the patch, it was applied to meta-java master and jdk-7 branch.

Bye Henning

Patch

diff --git a/recipes-core/llvm/llvm2.8/add-unistd.patch b/recipes-core/llvm/llvm2.8/add-unistd.patch
new file mode 100644
index 0000000..1c51b30
--- /dev/null
+++ b/recipes-core/llvm/llvm2.8/add-unistd.patch
@@ -0,0 +1,12 @@ 
+Index: llvm-2.8/lib/ExecutionEngine/JIT/Intercept.cpp
+===================================================================
+--- llvm-2.8.orig/lib/ExecutionEngine/JIT/Intercept.cpp	2012-05-14 18:31:21.008318473 +0200
++++ llvm-2.8/lib/ExecutionEngine/JIT/Intercept.cpp	2012-05-14 18:32:53.523734850 +0200
+@@ -19,6 +19,7 @@
+ #include "llvm/Support/ErrorHandling.h"
+ #include "llvm/System/DynamicLibrary.h"
+ #include "llvm/Config/config.h"
++#include <unistd.h>
+ using namespace llvm;
+ 
+ // AtExitHandlers - List of functions to call when the program exits,
diff --git a/recipes-core/llvm/llvm2.8_2.8.bb b/recipes-core/llvm/llvm2.8_2.8.bb
index 310e94e..3459885 100644
--- a/recipes-core/llvm/llvm2.8_2.8.bb
+++ b/recipes-core/llvm/llvm2.8_2.8.bb
@@ -4,9 +4,12 @@  require llvm.inc
 LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855"
 
+PR = "r1"
+
 SRC_URI += " \
             file://30may-llvm2.8-pr399-ppc-arm.patch \
             file://0019-issue6065.patch \
+            file://add-unistd.patch \
            "
 
 SRC_URI_append_arm = " file://llvm-mc_disable.patch "