From patchwork Thu Nov 16 12:19:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 97077 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from sv.mirrors.kernel.org ([139.178.88.99]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r3bLn-008liP-PV for patchwork@linuxtv.org; Thu, 16 Nov 2023 12:20:06 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 74109281064 for ; Thu, 16 Nov 2023 12:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3B9822FE16; Thu, 16 Nov 2023 12:19:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="rrVjozVv" X-Original-To: linux-media@vger.kernel.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DFE51A7 for ; Thu, 16 Nov 2023 04:19:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1700137187; x=1700741987; i=ps.report@gmx.net; bh=iW0T5BT7BblpskLAJZrB8GeGcLqNHbw25J4oVc85lJU=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=rrVjozVvoi9N2QbkvzcxABeZfNjF5cfpAujlQvDxO8mit8xxNqJGhVtiT7KaQi51 67RzPJitR2p4SRsleLUW6qVrkjHTBWLa/nvgjEQMLs137eGoEGjVcG4KCs3gvG9/E d6A32iDoSuqwilVEp4qRGW+eOQblFpuCs+ohDPAGPZ5G/dZF7shYcn86CuqQNFTEE b1vdK/ulTKp8eLolP+Eex4QXbNVAg4TPvt1f+UG29uAYuqizaT57Y3sbRfW4hsQ/4 WHlbmGga9mr89bxtCWz5Ae/anUylp9wJKU4oQBOyyPOJrD3HV4lMIH/c4D9CwyZIt vNUkBP2IKiynWbXVig== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.247]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MG9kM-1r99Fn2w5k-00Gbnr for ; Thu, 16 Nov 2023 13:19:47 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 2/2] libv4l1/libv4l2/v4l2-tracer: use common meson c_args/cpp_args to disable transparent large file support Date: Thu, 16 Nov 2023 13:19:47 +0100 Message-ID: <20231116121947.28147-2-ps.report@gmx.net> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231116121947.28147-1-ps.report@gmx.net> References: <20231116121947.28147-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:JWEZVNIjcodQRY5ZaSYUFia3MSwzi6jGZvKOYEj/WagcB5AMtIw P3YU42zUmLqpJ3TZMYcFkZYzJTCK0rjF8keAEtyzJzMbdUq0v4TsfmMWKXWyfCVhQYCPDJT KoQfit9YtkyT/OVO9Z6Ra3R0oPRNACRHWkDoPhLym7hsFyx9fmhBA0S+Vb/o6fJSFLfJ1IQ JDAhhtzwuDbr+OE9Ee2+w== UI-OutboundReport: notjunk:1;M01:P0:Ew6pw6Io2QQ=;0ADuNSYFotXl1//P4B+tBB7M8xo UjQxtVw8QB6LW9g5XJbl2KAe02E+E62wAwqeD9rQuJkPD/5o7iFHHfUyHZsWI3COgsvE+8Bvo mkmJ5ZEef3U/0WqcWHok5/E2GDJLrNpkG6Ncw1/dTpz7nBCxvyEh223zoFr/de37ptomfc1Ia Ia0dAdymOPsQF0VIr4RirzjPqC7wfGnaIaFtybaSlGNncUhobH6bNioD1d5rE/m5vOOP4W7Hb by0nTkmxNphKtTjZOKnwJjseFbEUp6eNx9BCygKn5ajwIVHhkhbB2qHSJYHPiptSotxtI0QVt 923VvmOLsGb0C9SV6GmDr1RbRZnyQITWLmI9ZO00e/j48a4/T0CLR8qdGE1+rMF2TEo/KqTh+ GBewVRS8hNCNJk0fvU+/RXYZrhJvfgcIoZkKGO2HlIqCm4d8rpEHhywPh7Mc1HA6kQKRvX5VI p42dvV5vMZBiFsec27Ae60E9y2QXWf1Ihn6qFrZchA0Xy40+JNImQK6oJT7p1buhHIp5BoKV3 K6hiFSpWIdVWYe4B6wPH5HzW8vuXJ5s4dCOq2yP7LETeB60s4fTiZYaalAEwPCwAVa9+ltvcV BtUF9FZ9G42ZTElE8ZX5isMHeBlHHAZfE7+rQNBDvbcf1YOaUMMoRJJxdQKcJG1dBjUk4vEbx m5x1O7A5cNN9zkTDrM1C/yyEV6GDCz5HIHhHhMci6+7L1BCHQabcIbxHws0vfIpFW8OewIukQ fRDY+OE5kq45Xz6rLeKiNcpAsuyoM8DS8EGgLpt3ZKgoqJFIKjKLYM29MDU5XOxqneLlCSrSV 98tqoD5W0/h6nqX3k+k7ChgAIzuVUMMQHyS4VY98dC9ZdVXelDgB75O6rPteaEPC639umGB6d VFspY2B8T2FLlvLxqFy+Eq9+Gd59LRRIvMKgwooiYbkST//YUttva+NbiJqZr1y/lXzNB1ICo yrdeq/tG8UZ7RHA0Z45Sk3Itqc8= X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,MIME_BASE64_TEXT=1.741,RCVD_IN_DNSWL_MED=-2.3 autolearn=unavailable autolearn_force=no Use common meson c_args/cpp_args to disable transparent large file support for the wrappers as already done in utils/v4l2-tracer for lib/libv4l1/v4l1compat.c and lib/libv4l2/v4l2convert.c too. Signed-off-by: Peter Seiderer --- lib/libv4l1/meson.build | 1 + lib/libv4l1/v4l1compat.c | 5 ----- lib/libv4l2/meson.build | 1 + lib/libv4l2/v4l2convert.c | 5 ----- meson.build | 10 ++++++++++ utils/v4l2-tracer/meson.build | 13 +------------ 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/lib/libv4l1/meson.build b/lib/libv4l1/meson.build index e1df2fa2..e1fba346 100644 --- a/lib/libv4l1/meson.build +++ b/lib/libv4l1/meson.build @@ -60,5 +60,6 @@ v4l1compat = shared_module('v4l1compat', name_prefix : '', install : true, install_dir : libv4l1privdir, + c_args : v4l2_wrapper_args, dependencies : v4l1compat_deps, include_directories : v4l2_utils_incdir) diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c index 705d7d4b..2db68423 100644 --- a/lib/libv4l1/v4l1compat.c +++ b/lib/libv4l1/v4l1compat.c @@ -19,11 +19,6 @@ # 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 #include #include diff --git a/lib/libv4l2/meson.build b/lib/libv4l2/meson.build index bd6e0e7f..9d6ecd5f 100644 --- a/lib/libv4l2/meson.build +++ b/lib/libv4l2/meson.build @@ -69,5 +69,6 @@ v4l2convert = shared_module('v4l2convert', name_prefix : '', install : true, install_dir : libv4l2privdir, + c_args : v4l2_wrapper_args, dependencies : v4l2convert_deps, include_directories : v4l2_utils_incdir) diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c index 97bed9a9..396ed3ea 100644 --- a/lib/libv4l2/v4l2convert.c +++ b/lib/libv4l2/v4l2convert.c @@ -23,11 +23,6 @@ /* 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 #include #include diff --git a/meson.build b/meson.build index 1e76b0f4..75398917 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,16 @@ common_arguments = [ '-include', meson.current_build_dir() / 'config.h', ] +v4l2_wrapper_args = [ + # As the library needs to provide both 32-bit and 64-bit versions + # of file operations, disable transparent large file support (fixes + # 'Error: symbol `open64/mmap64' is already defined' compile failure + # otherwise) + '-U_FILE_OFFSET_BITS', + '-D_FILE_OFFSET_BITS=32', + '-D_LARGEFILE64_SOURCE', +] + v4l2_utils_incdir_arr = [ 'lib' / 'include', ] diff --git a/utils/v4l2-tracer/meson.build b/utils/v4l2-tracer/meson.build index ed2c1df8..47c0a1f6 100644 --- a/utils/v4l2-tracer/meson.build +++ b/utils/v4l2-tracer/meson.build @@ -70,21 +70,10 @@ libv4l2_tracer_incdir = [ v4l2_utils_incdir, ] -libv4l2_tracer_cpp_args = [ - # Meson enables large file support unconditionally, which redirects file - # operations to 64-bit versions. This results in some symbols being - # renamed, for instance open() being renamed to open64(). As the library - # needs to provide both 32-bit and 64-bit versions of file operations, - # disable transparent large file support. - '-U_FILE_OFFSET_BITS', - '-D_FILE_OFFSET_BITS=32', - '-D_LARGEFILE64_SOURCE', -] - libv4l2tracer = shared_module('v4l2tracer', libv4l2tracer_sources, install : true, - cpp_args : libv4l2_tracer_cpp_args, + cpp_args : v4l2_wrapper_args, dependencies : libv4l2tracer_deps, include_directories : libv4l2_tracer_incdir)