|
 |
7fd79c |
From 8bec8bcc639cfc7ed0ca7cd3a5321513aa4348fd Mon Sep 17 00:00:00 2001
|
|
|
7fd79c |
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
|
|
7fd79c |
Date: Sun, 5 Nov 2017 23:33:37 +0100
|
|
|
7fd79c |
Subject: [PATCH 80/81] libparted/labels: link with libiconv if needed
|
|
|
7fd79c |
|
|
|
7fd79c |
gpt.c uses iconv so it should link with it. Otherwise, on platforms
|
|
|
7fd79c |
where libiconv is a separate library, we get a link failure of parted:
|
|
|
7fd79c |
|
|
|
7fd79c |
CCLD parted
|
|
|
7fd79c |
../libparted/.libs/libparted.so: undefined reference to `libiconv'
|
|
|
7fd79c |
../libparted/.libs/libparted.so: undefined reference to `libiconv_open'
|
|
|
7fd79c |
../libparted/.libs/libparted.so: undefined reference to `libiconv_close'
|
|
|
7fd79c |
|
|
|
7fd79c |
Since iconv functionality is needed unconditionally (not only when
|
|
|
7fd79c |
gettext is enabled), AM_ICONV needs to be added to configure.ac.
|
|
|
7fd79c |
|
|
|
7fd79c |
(cherry picked from commit 571293e3f9ee45f37867578899c6a8a9cd35afd4)
|
|
|
7fd79c |
---
|
|
|
7fd79c |
configure.ac | 2 ++
|
|
|
7fd79c |
libparted/labels/Makefile.am | 2 +-
|
|
|
7fd79c |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
7fd79c |
|
|
|
7fd79c |
diff --git a/configure.ac b/configure.ac
|
|
|
7fd79c |
index 3d57157..5251dfb 100644
|
|
|
7fd79c |
--- a/configure.ac
|
|
|
7fd79c |
+++ b/configure.ac
|
|
|
7fd79c |
@@ -288,6 +288,8 @@ fi
|
|
|
7fd79c |
AC_PROG_LIBTOOL
|
|
|
7fd79c |
LT_INIT
|
|
|
7fd79c |
|
|
|
7fd79c |
+AM_ICONV
|
|
|
7fd79c |
+
|
|
|
7fd79c |
AM_GNU_GETTEXT_VERSION([0.18])
|
|
|
7fd79c |
AM_GNU_GETTEXT([external])
|
|
|
7fd79c |
if test "$USE_INCLUDED_LIBINTL" = "yes"; then
|
|
|
7fd79c |
diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
|
|
|
7fd79c |
index 3327c8c..db612d1 100644
|
|
|
7fd79c |
--- a/libparted/labels/Makefile.am
|
|
|
7fd79c |
+++ b/libparted/labels/Makefile.am
|
|
|
7fd79c |
@@ -36,7 +36,7 @@ liblabels_la_SOURCES = \
|
|
|
7fd79c |
rdb.c \
|
|
|
7fd79c |
sun.c
|
|
|
7fd79c |
|
|
|
7fd79c |
-liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS)
|
|
|
7fd79c |
+liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV)
|
|
|
7fd79c |
|
|
|
7fd79c |
AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
|
|
|
7fd79c |
|
|
|
7fd79c |
--
|
|
|
7fd79c |
2.13.6
|
|
|
7fd79c |
|