diff options
| author | Karel Zak <kzak@redhat.com> | 2024-04-15 08:59:07 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2024-04-15 08:59:07 +0200 |
| commit | 9ca73bae24a634672591f73f090fb36e56a500fb (patch) | |
| tree | 21837437df0e7181da389fb77467352ae0d0aee1 | |
| parent | a50ba8adf9bd145101800c88fa5e97c810312a82 (diff) | |
| parent | 21da737099626a5cf00e1e0719ed2262aae6e2ea (diff) | |
| download | util-linux-9ca73bae24a634672591f73f090fb36e56a500fb.tar.gz | |
Merge branch 'meson-version-script-libblkid' of https://github.com/jwillikers/util-linux
* 'meson-version-script-libblkid' of https://github.com/jwillikers/util-linux:
meson: Only use the --version-script linker flag where it is supported
| -rw-r--r-- | libblkid/meson.build | 12 | ||||
| -rw-r--r-- | libuuid/meson.build | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/libblkid/meson.build b/libblkid/meson.build index 8d1d880aa1..73ea0883d2 100644 --- a/libblkid/meson.build +++ b/libblkid/meson.build @@ -136,14 +136,22 @@ if build_libblkid and not have_dirfd and not have_ddfd error('neither dirfd nor ddfd are available') endif +libblkid_link_depends = [] +libblkid_link_args = [] + +if cc.has_link_argument('-Wl,--version-script=@0@'.format(libblkid_sym_path)) + libblkid_link_depends += [libblkid_sym] + libblkid_link_args += ['-Wl,--version-script=@0@'.format(libblkid_sym_path)] +endif + lib_blkid = both_libraries( 'blkid', list_h, lib_blkid_sources, include_directories : [dir_include, dir_libblkid], - link_depends : libblkid_sym, + link_depends : libblkid_link_depends, version : libblkid_version, - link_args : ['-Wl,--version-script=@0@'.format(libblkid_sym_path)], + link_args : libblkid_link_args, link_with : lib_common, dependencies : build_libblkid ? [lib_econf] : disabler(), install : build_libblkid) diff --git a/libuuid/meson.build b/libuuid/meson.build index a801b4e656..b67b3d5e72 100644 --- a/libuuid/meson.build +++ b/libuuid/meson.build @@ -20,6 +20,14 @@ unparse_c = files('src/unparse.c') libuuid_sym = 'src/libuuid.sym' libuuid_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libuuid_sym) +libuuid_link_depends = [] +libuuid_link_args = [] + +if cc.has_link_argument('-Wl,--version-script=@0@'.format(libuuid_sym_path)) + libuuid_link_depends += [libuuid_sym] + libuuid_link_args += ['-Wl,--version-script=@0@'.format(libuuid_sym_path)] +endif + lib_uuid = both_libraries( 'uuid', list_h, @@ -31,9 +39,9 @@ lib_uuid = both_libraries( md5_c, sha1_c, include_directories : [dir_include, dir_libuuid], - link_depends : libuuid_sym, + link_depends : libuuid_link_depends, version : libuuid_version, - link_args : ['-Wl,--version-script=@0@'.format(libuuid_sym_path)], + link_args : libuuid_link_args, dependencies : [socket_libs, build_libuuid ? [] : disabler()], install : build_libuuid) |