mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-07-24 07:58:24 +02:00
dc7500b3c9
Backport another upstream patch. Closes: https://bugs.gentoo.org/910487 Signed-off-by: Sam James <sam@gentoo.org>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
https://bugs.gentoo.org/910487
|
|
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=d22c2d01f62139e0d386d90584cac0705857a571
|
|
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=60b3300ed6d3ba2e7af4ddce55bd873b232d12ff
|
|
|
|
From d22c2d01f62139e0d386d90584cac0705857a571 Mon Sep 17 00:00:00 2001
|
|
From: Yegor Yefremov <yegorslists@googlemail.com>
|
|
Date: Thu, 11 May 2023 10:03:59 +0200
|
|
Subject: parted: link to libuuid
|
|
|
|
parted.c uses libuuid since 61b3a9733c0e0a79ccc43096642d378c8706add6.
|
|
Hence, add UUID_LIBS to PARTED_LIBS to avoid
|
|
"DSO missing from command line" error.
|
|
|
|
Signed-off-by: Brian C. Lane <bcl@redhat.com>
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -298,6 +298,8 @@ Note: originally, libuuid was part of the e2fsprogs package. Later, it
|
|
moved to util-linux-ng-2.16, and that package is now the preferred source.])])
|
|
AC_SUBST([UUID_LIBS])
|
|
|
|
+PARTED_LIBS="$PARTED_LIBS $UUID_LIBS"
|
|
+
|
|
dnl Check for libdevmapper
|
|
DM_LIBS=
|
|
if test $ENABLE_DEVICE_MAPPER = yes; then
|
|
--
|
|
cgit v1.1
|
|
|
|
From 60b3300ed6d3ba2e7af4ddce55bd873b232d12ff Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Mon, 12 Jun 2023 10:55:19 -0700
|
|
Subject: bug#64034: [PATCH] libparted: link libparted-fs-resize.so to libuuid
|
|
|
|
uuid_generate() is used in this library
|
|
Hence, add UUID_LIBS to libparted_fs_resize_la_LIBADD to avoid
|
|
|
|
"ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate"
|
|
|
|
This is uncovered by lld linker linking fatresize package
|
|
due to this linker defaulting to --no-allow-shlib-undefined.
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Signed-off-by: Brian C. Lane <bcl@redhat.com>
|
|
---
|
|
libparted/fs/Makefile.am | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
|
|
index 41a60d9..7fa8d14 100644
|
|
--- a/libparted/fs/Makefile.am
|
|
+++ b/libparted/fs/Makefile.am
|
|
@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \
|
|
EXTRA_DIST += fsresize.sym
|
|
libparted_fs_resize_la_DEPENDENCIES = $(sym_file)
|
|
|
|
+libparted_fs_resize_la_LIBADD = $(UUID_LIBS)
|
|
libparted_fs_resize_la_SOURCES = \
|
|
r/filesys.c \
|
|
r/fat/bootsector.c \
|
|
--
|
|
cgit v1.1
|