tag 673580 + patch
thanks

Steven Chamberlain <ste...@pyro.eu.org> writes:

> Related to #673266, there is some remaining code that FTBFS
> on kfreebsd-* and hurd-i386 with gcc-4.7:

The attached patch should fix this. I tried it on both amd64 and
kfreebsd-amd64 and it builds fine.

Vincent

diff -Nru llvm-2.9-2.9+dfsg/debian/changelog llvm-2.9-2.9+dfsg/debian/changelog
--- llvm-2.9-2.9+dfsg/debian/changelog	2012-05-18 09:24:12.000000000 +0200
+++ llvm-2.9-2.9+dfsg/debian/changelog	2012-05-20 11:37:06.000000000 +0200
@@ -1,3 +1,11 @@
+llvm-2.9 (2.9+dfsg-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update patches/0035-gcc-4.7.patch to fix a remaining build failure with
+    gcc-4.7 on kfreebsd and hurd. (Closes: #673580)
+
+ -- Vincent Legout <vleg...@debian.org>  Sun, 20 May 2012 11:31:18 +0200
+
 llvm-2.9 (2.9+dfsg-6) unstable; urgency=low
 
   [ Vincent Legout ]
diff -Nru llvm-2.9-2.9+dfsg/debian/patches/0035-gcc-4.7.patch llvm-2.9-2.9+dfsg/debian/patches/0035-gcc-4.7.patch
--- llvm-2.9-2.9+dfsg/debian/patches/0035-gcc-4.7.patch	2012-05-18 09:28:30.000000000 +0200
+++ llvm-2.9-2.9+dfsg/debian/patches/0035-gcc-4.7.patch	2012-05-20 11:37:14.000000000 +0200
@@ -1,6 +1,7 @@
 ---
- Intercept.cpp |    1 +
- 1 file changed, 1 insertion(+)
+ lib/ExecutionEngine/JIT/Intercept.cpp                         |    1 +
+ utils/unittest/googletest/include/gtest/internal/gtest-port.h |    1 +
+ 2 files changed, 2 insertions(+)
 
 --- a/lib/ExecutionEngine/JIT/Intercept.cpp	2012-05-17 16:11:46.956180361 +0200
 +++ b/lib/ExecutionEngine/JIT/Intercept.cpp	2012-05-17 16:14:35.256184996 +0200
@@ -12,3 +13,14 @@
  /* 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' 
   * available as an exported symbol, so we have to add it explicitly.
+
+--- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h
++++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h
+@@ -177,6 +177,7 @@
+ #ifndef _WIN32_WCE
+ #include <sys/stat.h>
+ #endif  // !_WIN32_WCE
++#include <unistd.h>
+ 
+ #include <iostream>  // NOLINT
+ #include <sstream>  // NOLINT

Reply via email to