From: Jordan Williams <jordan@jwillikers.com>
Date: Mon, 1 Apr 2024 17:18:52 +0000 (-0500)
Subject: meson: Only pick up the rt library once
X-Git-Tag: v2.40.1-rc1~37^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712e9271d199aacc0694c73b5c908203713bb16a;p=thirdparty%2Futil-linux.git

meson: Only pick up the rt library once

Require the rt library for the build-lsfd feature.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
(cherry picked from commit 243950279f413e3844d13a2d87b3853c1242f437)
---

diff --git a/meson.build b/meson.build
index d2a165476..bd8d0e394 100644
--- a/meson.build
+++ b/meson.build
@@ -729,10 +729,10 @@ if not cc.has_function('socket')
   endif
 endif
 
+lib_rt = cc.find_library('rt', required : false)
 realtime_libs = []
 have = cc.has_function('clock_gettime')
 if not have
-  lib_rt = cc.find_library('rt', required : false)
   if lib_rt.found()
     realtime_libs += lib_rt
     have = cc.has_function('clock_gettime',
@@ -745,7 +745,6 @@ thread_libs = dependency('threads')
 
 have = cc.has_function('timer_create')
 if not have
-  lib_rt = cc.find_library('rt', required : false)
   if lib_rt.found()
     realtime_libs = [lib_rt]
     have = cc.has_function('timer_create',
@@ -2714,9 +2713,7 @@ endif
 mq_libs = []
 mq_libs += cc.find_library('rt', required : true)
 
-lib_rt = cc.find_library('rt', required : get_option('build-lsfd'))
-
-opt = not get_option('build-lsfd').disabled()
+opt = not get_option('build-lsfd').require(lib_rt.found()).disabled()
 exe = executable(
   'lsfd',
   lsfd_sources,