site/elfutils/libunistring: Drop patching for iconv and set in site file

The standard macros from gettext for iconv include problematic tests which
we've been patching out adhoc. Stop doing this and set results in the site
files instead which is simpler, more maintainable and peforms better too
as an added bonus.

(From OE-Core rev: 5a3bfdc4af18302cf0e3ea5802fdfefaa7235657)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 0 insertions, 57 deletions

diff --git a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
deleted file mode 100644
index 9e8ce2270d..0000000000
--- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 5 Dec 2017 09:30:36 +0200
-Subject: [PATCH] remove the test to convert euc-jp
-
-Remove the test "Test against HP-UX 11.11 bug:
-No converter from EUC-JP to UTF-8 is provided"
-since we don't support HP-UX and if the euc-jp is not
-installed on the host, libunistring will be built without
-iconv support and will cause guild-native configure fail.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
----
- gnulib-m4/iconv.m4 | 23 -----------------------
- 1 file changed, 23 deletions(-)
-
-diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4
-index b33ecd0..73b6aa1 100644
---- a/gnulib-m4/iconv.m4
-+++ b/gnulib-m4/iconv.m4
-@@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK],
-       }
-   }
- #endif
--  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
--     provided.  */
--  {
--    /* Try standardized names.  */
--    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
--    /* Try IRIX, OSF/1 names.  */
--    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
--    /* Try AIX names.  */
--    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
--    /* Try HP-UX names.  */
--    iconv_t cd4 = iconv_open ("utf8", "eucJP");
--    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
--        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
--      result |= 16;
--    if (cd1 != (iconv_t)(-1))
--      iconv_close (cd1);
--    if (cd2 != (iconv_t)(-1))
--      iconv_close (cd2);
--    if (cd3 != (iconv_t)(-1))
--      iconv_close (cd3);
--    if (cd4 != (iconv_t)(-1))
--      iconv_close (cd4);
--  }
-   return result;
- ]])],
-           [am_cv_func_iconv_works=yes], ,
--- 
-2.4.0
-
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_0.9.10.bb
index 97fac4ecfa..0a7b18ed08 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb
+++ b/meta/recipes-support/libunistring/libunistring_0.9.10.bb
@@ -20,7 +20,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
                    "
 
 SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
-           file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
 "
 SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b"