pull request 20120907

PATCH Applied Steffen Sledz 2 participants 3 messages Sep 7, 2012 – Sep 14, 2012

lore

Share & tools

lore

Steffen Sledz

author

2012-09-07 15:25 UTC #0 lore raw

cover pull request 20120907

Hi Tom,

please pull this commit into 2011.03-maintenance branch. It fixes a build problem with llvm2.7.

Thx,
Steffen

The following changes since commit 3b1d1112a9a80aba8dbee8b7bd54fe83a1acc6a1:

gtk+_2.20.1: Depend on gdk-pixbuf-native (2012-08-31 14:06:28 -0700)

are available in the git repository at:

git://github.com/sledz/oe pull-request-1
https://github.com/sledz/oe/tree/pull-request-1

Steffen Sledz (1):
llvm2.7: provide "lseek64" symbol

 recipes/llvm/llvm2.7/r137567-lseek64.patch |   23 +++++++++++++++++++++++
 recipes/llvm/llvm2.7_2.7.bb                |    3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 recipes/llvm/llvm2.7/r137567-lseek64.patch

Signature · 1 line

1.7.10.4

Steffen Sledz

author

2012-09-07 15:25 UTC #1 lore raw

PATCH 1/1 llvm2.7: provide "lseek64" symbol

EE: Provide the symbol "lseek64" explicitly with <unistd.h> on Linux glibc.

With libcxx, it seems <unistd.h> would not be provided. Thanks to Ryuta Suzuki.

Signed-off-by Steffen Sledz <[email protected]>

---
 recipes/llvm/llvm2.7/r137567-lseek64.patch |   23 +++++++++++++++++++++++
 recipes/llvm/llvm2.7_2.7.bb                |    3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 recipes/llvm/llvm2.7/r137567-lseek64.patch

recipes/llvm/llvm2.7/r137567-lseek64.patch new file +23 -0

new file mode 100644
index 0000000..a751d0f
@@ -0,0 +1,23 @@
+Upstream-Status: Accepted
+
+EE: Provide the symbol "lseek64" explicitly with <unistd.h> on Linux glibc.
+
+With libcxx, it seems <unistd.h> would not be provided. Thanks to Ryuta Suzuki.
+
+See also:
+
+   <http://llvm.org/viewvc/llvm-project?view=rev&revision=137567>
+
+Signed-off-by: Steffen Sledz <[email protected]>
+
+diff -Nurd llvm-2.7.orig/lib/ExecutionEngine/JIT/Intercept.cpp llvm-2.7/lib/ExecutionEngine/JIT/Intercept.cpp
+--- llvm-2.7.orig/lib/ExecutionEngine/JIT/Intercept.cpp	2012-09-07 16:21:14.000000000 +0200
++++ llvm-2.7/lib/ExecutionEngine/JIT/Intercept.cpp	2012-09-07 16:22:14.000000000 +0200
+@@ -51,6 +51,7 @@
+ #if defined(HAVE_SYS_STAT_H)
+ #include <sys/stat.h>
+ #endif
++#include <unistd.h>"
+ #include <fcntl.h>
+ /* stat functions are redirecting to __xstat with a version number.  On x86-64 
+  * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat'

recipes/llvm/llvm2.7_2.7.bb +2 -1

index 7d56e7d..758c337 100644
@@ -1,6 +1,6 @@
 require llvm.inc
 
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "llvm-common llvm2.7-native"

@@ -16,6 +16,7 @@ SRC_URI += "\
   file://r104653-BFC-BFI.patch \
   file://rawMOVLRPC.patch \
   file://include-fixes.patch \
+  file://r137567-lseek64.patch \
   "
 
 LLVM_RELEASE = "2.7"

Signature · 1 line

1.7.10.4

Tom Rini

Applied

2012-09-14 22:17 UTC #2 lore raw

In reply to Steffen Sledz

Quoted 17 lines · Steffen Sledz

Hi Tom,
please pull this commit into 2011.03-maintenance branch. It fixes a build problem with llvm2.7.
Thx,
Steffen
The following changes since commit 3b1d1112a9a80aba8dbee8b7bd54fe83a1acc6a1:
gtk+_2.20.1: Depend on gdk-pixbuf-native (2012-08-31 14:06:28 -0700)
are available in the git repository at:
git://github.com/sledz/oe pull-request-1
https://github.com/sledz/oe/tree/pull-request-1

Quoted 7 lines

Steffen Sledz (1):
llvm2.7: provide "lseek64" symbol

 recipes/llvm/llvm2.7/r137567-lseek64.patch |   23 +++++++++++++++++++++++
 recipes/llvm/llvm2.7_2.7.bb                |    3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 recipes/llvm/llvm2.7/r137567-lseek64.patch

Applied, thanks!

Signature · 1 line

Tom