From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 19 May 2025 15:41:18 +0000 (+0200)
Subject: meson: Make sure fuzz-journal-remote is built in oss-fuzz
X-Git-Tag: v258-rc1~569^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4b4a9b6773cf4fa228d87dc473f563f1b7ff6b6;p=thirdparty%2Fsystemd.git

meson: Make sure fuzz-journal-remote is built in oss-fuzz

oss-fuzz builds with --auto-features=disabled, yet we have to make
sure all fuzzers are still built when --auto-features=disabled, so
let's always build systemd-journal-remote even if it is disabled so
that we can use its objects to build fuzz-journal-remote. Instead,
when remote=disabled, we make sure we don't installed
systemd-journal-remote.
---

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 04b0f6e8812..47515db0a7e 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if conf.get('ENABLE_REMOTE') != 1
-        subdir_done()
-endif
-
 systemd_journal_gatewayd_sources = files(
         'journal-gatewayd.c',
 )
@@ -39,7 +35,10 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-journal-gatewayd',
                 'public' : true,
-                'conditions' : ['HAVE_MICROHTTPD'],
+                'conditions' : [
+                        'ENABLE_REMOTE',
+                        'HAVE_MICROHTTPD',
+                ],
                 'sources' : systemd_journal_gatewayd_sources + systemd_journal_gatewayd_extract_sources,
                 'extract' : systemd_journal_gatewayd_extract_sources,
                 'dependencies' : common_deps + [libmicrohttpd],
@@ -47,6 +46,10 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-journal-remote',
                 'public' : true,
+                # We always build systemd-journal regardless of ENABLE_REMOTE because we have to build
+                # fuzz-journal-remote even when --auto-features=disabled (see tools/oss-fuzz.sh for why).
+                # Instead, we make sure we don't install it when the remote feature is disabled.
+                'install' : conf.get('ENABLE_REMOTE') == 1,
                 'sources' : systemd_journal_remote_sources + systemd_journal_remote_extract_sources,
                 'objects' : conf.get('HAVE_MICROHTTPD') == 1 ? ['systemd-journal-gatewayd'] : [],
                 'extract' : systemd_journal_remote_extract_sources,
@@ -55,7 +58,10 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-journal-upload',
                 'public' : true,
-                'conditions' : ['HAVE_LIBCURL'],
+                'conditions' : [
+                        'ENABLE_REMOTE',
+                        'HAVE_LIBCURL',
+                ],
                 'sources' : systemd_journal_upload_sources + systemd_journal_upload_extract_sources,
                 'objects' : ['systemd-journal-remote'],
                 'extract' : systemd_journal_upload_extract_sources,
@@ -63,7 +69,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-journal-header-util.c'),
-                'conditions' : ['HAVE_LIBCURL'],
+                'conditions' : ['ENABLE_REMOTE', 'HAVE_LIBCURL'],
                 'objects' : ['systemd-journal-upload'],
         },
         fuzz_template + {
@@ -74,8 +80,10 @@ executables += [
 ]
 
 in_files = [
-        ['journal-upload.conf', conf.get('HAVE_LIBCURL') == 1 and install_sysconfdir_samples],
-        ['journal-remote.conf', conf.get('HAVE_MICROHTTPD') == 1 and install_sysconfdir_samples]]
+        ['journal-upload.conf',
+         conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 and install_sysconfdir_samples],
+        ['journal-remote.conf',
+         conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 and install_sysconfdir_samples]]
 
 foreach tuple : in_files
         file = tuple[0]
@@ -88,7 +96,7 @@ foreach tuple : in_files
                 install_dir : pkgconfigfiledir)
 endforeach
 
-if conf.get('HAVE_MICROHTTPD') == 1
+if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
         install_data('browse.html',
                      install_dir : pkgdatadir / 'gatewayd')