diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2012-09-13 15:49:05 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-14 14:06:19 +0000 |
| commit | a4e8938c1c5a2e6c89b02050d41654bc2af247e3 (patch) | |
| tree | 1191b1c3a5045bec0688ea094ce24d240c5339bd /main/xen/blktap2_libvhd_add_iconv.patch | |
| parent | 5d10cb782ac6836c6f9d20a536b78260e47c7232 (diff) | |
| download | aports-a4e8938c1c5a2e6c89b02050d41654bc2af247e3.tar.bz2 aports-a4e8938c1c5a2e6c89b02050d41654bc2af247e3.tar.xz | |
xen: update to 4.2.0-rc4
Next version (4.2) is scheduled to be released very soon
if everything goes ok. This is a very close rc,
which we can start testing until 4.2 comes out.
Diffstat (limited to 'main/xen/blktap2_libvhd_add_iconv.patch')
| -rw-r--r-- | main/xen/blktap2_libvhd_add_iconv.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/main/xen/blktap2_libvhd_add_iconv.patch b/main/xen/blktap2_libvhd_add_iconv.patch deleted file mode 100644 index 2353e38a6b..0000000000 --- a/main/xen/blktap2_libvhd_add_iconv.patch +++ /dev/null @@ -1,31 +0,0 @@ -# HG changeset patch -# Parent 14e911353a91702b439bc06e2a77d67e8bd5f661 -blktap2/vhd: add -liconv when linking if using libiconv - -If libiconv is detected on the system add -liconv when linking the -libvhd library. - -If -liconv is not added when compiling libvhd with libiconv the -following error occours when linking vhd-util and vhd-update: - -gcc -o vhd-util vhd-util.o -Llib -lvhd -lib/libvhd.so: undefined reference to `libiconv_open' -lib/libvhd.so: undefined reference to `libiconv_close' -lib/libvhd.so: undefined reference to `libiconv' - -Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> - -diff -r 14e911353a91 tools/blktap2/vhd/lib/Makefile ---- a/tools/blktap2/vhd/lib/Makefile Tue Dec 20 02:30:12 2011 +0100 -+++ b/tools/blktap2/vhd/lib/Makefile Tue Dec 20 02:33:11 2011 +0100 -@@ -23,6 +23,10 @@ ifeq ($(CONFIG_Linux),y) - LIBS := -luuid - endif - -+ifeq ($(CONFIG_LIBICONV),y) -+LIBS += -liconv -+endif -+ - LIB-SRCS := libvhd.c - LIB-SRCS += libvhd-journal.c - LIB-SRCS += vhd-util-coalesce.c |