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/detect_libiconv.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/detect_libiconv.patch')
-rw-r--r-- | main/xen/detect_libiconv.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/main/xen/detect_libiconv.patch b/main/xen/detect_libiconv.patch deleted file mode 100644 index 5b2359eb67..0000000000 --- a/main/xen/detect_libiconv.patch +++ /dev/null @@ -1,22 +0,0 @@ -# HG changeset patch -# Parent 2bc60167b9f8791747d2cea09c5207a9c2d7ef7b -build: detect is libiconv is present - -Detect if libiconv is present in the system, since we will have to -link against it when using iconv. - -Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> - -diff -r 2bc60167b9f8 Config.mk ---- a/Config.mk Tue Dec 20 05:25:19 2011 +0100 -+++ b/Config.mk Tue Dec 20 07:52:38 2011 +0100 -@@ -9,6 +9,10 @@ - XEN_OS ?= $(shell uname -s) - - CONFIG_$(XEN_OS) := y -+CONFIG_LIBICONV := $(shell export OS="`uname -s`"; \ -+ export CHECK_LIB="$(CHECK_LIB)"; \ -+ . $(XEN_ROOT)/tools/check/funcs.sh; \ -+ has_lib libiconv.so && echo 'y' || echo 'n') - - SHELL ?= /bin/sh |