From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
Peter Korsgaard <jacmet@sunsite.dk>,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH] libv4l: fixup lfs mismatch in preload libraries
Date: Wed, 11 Jul 2018 10:22:51 -0300 [thread overview]
Message-ID: <20180711132251.13172-1-ezequiel@collabora.com> (raw)
From: Peter Korsgaard <jacmet@sunsite.dk>
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.
Without this patch, the following assembler errors appear
during cross-compiling with Buildroot:
/tmp/ccc3gdJg.s: Assembler messages:
/tmp/ccc3gdJg.s:67: Error: symbol `open64' is already defined
/tmp/ccc3gdJg.s:130: Error: symbol `mmap64' is already defined
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
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 cb79629ff88f..e5c9e56261e2 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 7c9a04c086ed..13ca4cfb1b08 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
#ifdef ANDROID
--
2.18.0.rc2
next reply other threads:[~2018-07-11 13:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 13:22 Ezequiel Garcia [this message]
2018-07-11 14:55 ` [PATCH] libv4l: fixup lfs mismatch in preload libraries Mauro Carvalho Chehab
2018-07-11 19:38 ` Baruch Siach
2018-07-11 22:57 ` Ezequiel Garcia
2018-07-12 8:54 ` Mauro Carvalho Chehab
2018-07-12 19:13 ` Baruch Siach
2018-07-12 20:13 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180711132251.13172-1-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=jacmet@sunsite.dk \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox