c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-29 12:29:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

libfetch: unquote @LIBFETCH_SONAME@ subst

Browse Source 
@LIBFETCH_SONAME@ is no longer quoted. The C define still is.

Ref: 153f7c9f72
Ref: https://github.com/openzfs/zfs/pull/12835#discussion_r776833743
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Damian Szuberski <szuberskidamian@gmail.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12922
This commit is contained in:
наб 2022-01-06 20:26:40 +01:00 committed by Tony Hutter
parent 0cb2d8a60b
commit 765be36006
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/user-libfetch.m4
View File

@ -32,7 +32,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBFETCH], [
have_libfetch=1 have_libfetch=1
LIBFETCH_IS_FETCH=1 LIBFETCH_IS_FETCH=1
LIBFETCH_DYNAMIC=1 LIBFETCH_DYNAMIC=1
LIBFETCH_SONAME='"libfetch.so.6"' LIBFETCH_SONAME="libfetch.so.6"
LIBFETCH_LIBS="-ldl" LIBFETCH_LIBS="-ldl"
AC_MSG_RESULT([fetch(3)]) AC_MSG_RESULT([fetch(3)])
], []) ], [])
@ -45,7 +45,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBFETCH], [
LIBFETCH_IS_LIBCURL=1 LIBFETCH_IS_LIBCURL=1
if test "$(curl-config --built-shared)" = "yes"; then if test "$(curl-config --built-shared)" = "yes"; then
LIBFETCH_DYNAMIC=1 LIBFETCH_DYNAMIC=1
LIBFETCH_SONAME='"libcurl.so.4"' LIBFETCH_SONAME="libcurl.so.4"
LIBFETCH_LIBS="-ldl" LIBFETCH_LIBS="-ldl"
AC_MSG_RESULT([libcurl]) AC_MSG_RESULT([libcurl])
else else
@ -67,5 +67,5 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBFETCH], [
AC_DEFINE_UNQUOTED([LIBFETCH_IS_FETCH], [$LIBFETCH_IS_FETCH], [libfetch is fetch(3)]) AC_DEFINE_UNQUOTED([LIBFETCH_IS_FETCH], [$LIBFETCH_IS_FETCH], [libfetch is fetch(3)])
AC_DEFINE_UNQUOTED([LIBFETCH_IS_LIBCURL], [$LIBFETCH_IS_LIBCURL], [libfetch is libcurl]) AC_DEFINE_UNQUOTED([LIBFETCH_IS_LIBCURL], [$LIBFETCH_IS_LIBCURL], [libfetch is libcurl])
AC_DEFINE_UNQUOTED([LIBFETCH_DYNAMIC], [$LIBFETCH_DYNAMIC], [whether the chosen libfetch is to be loaded at run-time]) AC_DEFINE_UNQUOTED([LIBFETCH_DYNAMIC], [$LIBFETCH_DYNAMIC], [whether the chosen libfetch is to be loaded at run-time])
AC_DEFINE_UNQUOTED([LIBFETCH_SONAME], [$LIBFETCH_SONAME], [soname of chosen libfetch]) AC_DEFINE_UNQUOTED([LIBFETCH_SONAME], ["$LIBFETCH_SONAME"], [soname of chosen libfetch])
]) ])

4
contrib/dracut/90zfs/module-setup.sh.in
View File

@ -61,9 +61,9 @@ install() {
dracut_install /usr/lib*/gcc/**/libgcc_s.so* dracut_install /usr/lib*/gcc/**/libgcc_s.so*
fi fi
# shellcheck disable=SC2050 # shellcheck disable=SC2050
if [ @LIBFETCH_DYNAMIC@ != 0 ]; then if [ @LIBFETCH_DYNAMIC@ -gt 0 ]; then
for d in $libdirs; do for d in $libdirs; do
[ -e "$d/"@LIBFETCH_SONAME@ ] && dracut_install "$d/"@LIBFETCH_SONAME@ [ -e "$d/@LIBFETCH_SONAME@" ] && dracut_install "$d/@LIBFETCH_SONAME@"
done done
fi fi
dracut_install @mounthelperdir@/mount.zfs dracut_install @mounthelperdir@/mount.zfs

4
contrib/initramfs/hooks/zfs.in
View File

@ -31,8 +31,8 @@ find /lib/ -type f -name "libgcc_s.so.[1-9]" | while read -r libgcc; do
done done
# shellcheck disable=SC2050 # shellcheck disable=SC2050
if [ @LIBFETCH_DYNAMIC@ != 0 ]; then if [ @LIBFETCH_DYNAMIC@ -gt 0 ]; then
find /lib/ -name @LIBFETCH_SONAME@ | while read -r libfetch; do find /lib/ -name "@LIBFETCH_SONAME@" | while read -r libfetch; do
copy_exec "$libfetch" copy_exec "$libfetch"
done done
fi fi