From d059b1cc61dcafde47723c45b834409026a39dbe Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 11 Oct 2012 10:29:06 +0200 Subject: [PATCH] libv4l: fixup after CPPFLAGS addition Fixes http://autobuild.buildroot.net/results/4602f7cf4407a2969a04267bbc5d276b076a7c91 The preload libraries needs to wrap both the lfs and !lfs variants, so ensure the lfs versions are not transparently used (as they are when _LARGEFILE_SOURCE / _FILE_OFFSET_BITS=64 are defined). This used to work by accident before, as our custom CFLAGS (containing those defines) wasn't used. Signed-off-by: Peter Korsgaard --- package/libv4l/libv4l-largefile.patch | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libv4l/libv4l-largefile.patch diff --git a/package/libv4l/libv4l-largefile.patch b/package/libv4l/libv4l-largefile.patch new file mode 100644 index 0000000000..9df8652adc --- /dev/null +++ b/package/libv4l/libv4l-largefile.patch @@ -0,0 +1,39 @@ +[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 +--- + lib/libv4l1/v4l1compat.c | 3 +++ + lib/libv4l2/v4l2convert.c | 3 +++ + 2 files changed, 6 insertions(+) + +Index: v4l-utils-0.8.5/lib/libv4l1/v4l1compat.c +=================================================================== +--- v4l-utils-0.8.5.orig/lib/libv4l1/v4l1compat.c ++++ v4l-utils-0.8.5/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 +Index: v4l-utils-0.8.5/lib/libv4l2/v4l2convert.c +=================================================================== +--- v4l-utils-0.8.5.orig/lib/libv4l2/v4l2convert.c ++++ v4l-utils-0.8.5/lib/libv4l2/v4l2convert.c +@@ -20,6 +20,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 -- 2.30.2