|
@@ -0,0 +1,44 @@
|
|
|
+From e5952b043a71fe83fbc392e498e8f77774fca0d8 Mon Sep 17 00:00:00 2001
|
|
|
+From: Peter Korsgaard <jacmet@sunsite.dk>
|
|
|
+Date: Sat, 28 Jun 2014 09:32:53 -0300
|
|
|
+Subject: [PATCH] fixup lfs mismatch in preload libraries
|
|
|
+
|
|
|
+Ensure that the lfs variants are not transparently used instead of the !lfs
|
|
|
+ones so both can be wrapped, independently of any custom CFLAGS/CPPFLAGS.
|
|
|
+
|
|
|
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
|
|
+---
|
|
|
+ lib/libv4l1/v4l1compat.c | 3 +++
|
|
|
+ lib/libv4l2/v4l2convert.c | 3 +++
|
|
|
+ 2 files changed, 6 insertions(+)
|
|
|
+
|
|
|
+diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c
|
|
|
+index e328288..70eb74f 100644
|
|
|
+--- a/lib/libv4l1/v4l1compat.c
|
|
|
++++ b/lib/libv4l1/v4l1compat.c
|
|
|
+@@ -19,6 +19,9 @@
|
|
|
+ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
|
|
+ */
|
|
|
+
|
|
|
++/* ensure we see *64 variants and they aren't transparently used */
|
|
|
++#undef _LARGEFILE_SOURCE
|
|
|
++#undef _FILE_OFFSET_BITS
|
|
|
+ #define _LARGEFILE64_SOURCE 1
|
|
|
+
|
|
|
+ #include <config.h>
|
|
|
+diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c
|
|
|
+index 9b46ab8..bc41056 100644
|
|
|
+--- a/lib/libv4l2/v4l2convert.c
|
|
|
++++ b/lib/libv4l2/v4l2convert.c
|
|
|
+@@ -23,6 +23,9 @@
|
|
|
+ /* prevent GCC 4.7 inlining error */
|
|
|
+ #undef _FORTIFY_SOURCE
|
|
|
+
|
|
|
++/* ensure we see *64 variants and they aren't transparently used */
|
|
|
++#undef _LARGEFILE_SOURCE
|
|
|
++#undef _FILE_OFFSET_BITS
|
|
|
+ #define _LARGEFILE64_SOURCE 1
|
|
|
+
|
|
|
+ #include <config.h>
|
|
|
+--
|
|
|
+1.9.1
|