meson: remove ld_libdir_prefix option

The option defaults to false in-tree and across all distributions. The only alleged use-case is the build.sh/build-srt.sh scripts. Although the output of those scripts is absolutely identical with or w/o the flag. Remove it. Signed-off-by: Emil Velikov <[email protected]>
flightlessmango · Mar 13, 2023 · def59db · def59db
1 parent d719353
commit def59db
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/build-srt.sh b/build-srt.sh
@@ -69,13 +69,13 @@ configure() {
     if [[ ! -f "build-srt/meson64/build.ninja" ]]; then
         export CC="${LOCAL_CC}"
         export CXX="${LOCAL_CXX}"
-        meson build-srt/meson64 --libdir lib/mangohud/lib --prefix /usr -Dappend_libdir_mangohud=false -Dld_libdir_prefix=true $@ ${CONFIGURE_OPTS}
+        meson build-srt/meson64 --libdir lib/mangohud/lib --prefix /usr -Dappend_libdir_mangohud=false $@ ${CONFIGURE_OPTS}
     fi
     if [[ ! -f "build-srt/meson32/build.ninja" ]]; then
         export CC="${LOCAL_CC} -m32"
         export CXX="${LOCAL_CXX} -m32"
         export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH_32}"
-        meson build-srt/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false -Dld_libdir_prefix=true $@ ${CONFIGURE_OPTS}
+        meson build-srt/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false $@ ${CONFIGURE_OPTS}
     fi
 }
 

diff --git a/build.sh b/build.sh
@@ -142,13 +142,13 @@ configure() {
     git submodule update --init --depth 50
     CONFIGURE_OPTS="-Dwerror=true"
     if [[ ! -f "build/meson64/build.ninja" ]]; then
-        meson build/meson64 --libdir lib/mangohud/lib64 --prefix /usr -Dappend_libdir_mangohud=false -Dld_libdir_prefix=true -Dld_libdir_abs=true $@ ${CONFIGURE_OPTS}
+        meson build/meson64 --libdir lib/mangohud/lib64 --prefix /usr -Dappend_libdir_mangohud=false -Dld_libdir_abs=true $@ ${CONFIGURE_OPTS}
     fi
     if [[ ! -f "build/meson32/build.ninja" && "$MACHINE" = "x86_64" ]]; then
         export CC="gcc -m32"
         export CXX="g++ -m32"
         export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH_32}"
-        meson build/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false -Dld_libdir_prefix=true -Dld_libdir_abs=true $@ ${CONFIGURE_OPTS}
+        meson build/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false -Dld_libdir_abs=true $@ ${CONFIGURE_OPTS}
     fi
 }
 

diff --git a/meson_options.txt b/meson_options.txt
@@ -3,7 +3,6 @@ option('use_system_vulkan', type : 'feature', value : 'disabled', description: '
 option('use_system_spdlog', type : 'feature', value : 'disabled', description: 'Use system spdlog library')
 option('vulkan_datadir', type : 'string', value : '', description: 'Path to the system vulkan headers data directory if different from MangoHud\'s datadir')
 option('append_libdir_mangohud', type : 'boolean', value : true, description: 'Append "mangohud" to libdir path or not.')
-option('ld_libdir_prefix', type : 'boolean', value : false, description: 'Set ld libdir to "$prefix/lib/mangohud/\$LIB"')
 option('ld_libdir_abs', type : 'boolean', value : false, description: 'Use absolute path in LD_PRELOAD')
 option('prepend_libdir_vk', type : 'boolean', value : true, description: 'Prepend libdir to library path in vulkan manifest')
 option('include_doc', type : 'boolean', value : true, description: 'Include the example config, man pages, appstream files etc.')

diff --git a/src/meson.build b/src/meson.build
@@ -9,12 +9,6 @@ else
   ld_libdir_mangohud = get_option('prefix') + '/\$LIB/'
 endif
 
-# For build.sh
-if get_option('ld_libdir_prefix')
-  # FIXME derive from libdir
-  ld_libdir_mangohud = get_option('prefix') + '/lib/mangohud/\$LIB/'
-endif
-
 conf_data = configuration_data()
 
 if get_option('ld_libdir_abs')