From patchwork Sat Sep 5 07:24:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 514799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 54AFD140284 for ; Sat, 5 Sep 2015 17:25:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CXOkWdDc; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68508A1C5C; Sat, 5 Sep 2015 07:25:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XHpImYWU0Puf; Sat, 5 Sep 2015 07:25:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B036C8BF82; Sat, 5 Sep 2015 07:25:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C07241C2C64 for ; Sat, 5 Sep 2015 07:25:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BD1048BF82 for ; Sat, 5 Sep 2015 07:25:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gCl0RXHQXZcG for ; Sat, 5 Sep 2015 07:25:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B29508BF5C for ; Sat, 5 Sep 2015 07:25:01 +0000 (UTC) Received: by wibz8 with SMTP id z8so36353798wib.1 for ; Sat, 05 Sep 2015 00:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=8bY2AbZ9zBxrTAsJftN0lGdFrsz8fFncCMPY/BCHiwc=; b=CXOkWdDcjI8QxikaNa5XKh2gerT4xcOmDTuDs3OD5bxPKpFB+x2TzvRmfeBrHQLXL4 wSwzhMY09I1ZiyTyw/WKMgEgF/RmHSoOKpoqzcfkbdSNKHhde77ZxiOrh4i2F4ukcoxC InSvROSeM9jJEpgS9uyuCgpb636OkFkKUSdZjwXq8AYgLw8jx3nuvVbNef+/NqfE5nDE J3eKxGXXQk/KMjAKgK2EcdooTpk1m0Z0KhSH9I6XaIrQv3xtw2/V7bjAmwKR4KCRkzm5 tS5kT//zzvTmir3Rk1fQj4TvOCpr0os2Y5Ig4l3wYnPjFu8TFai0iDuAHpmqD0cLgwWe Yx7w== X-Received: by 10.194.87.102 with SMTP id w6mr14617360wjz.111.1441437900242; Sat, 05 Sep 2015 00:25:00 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id j7sm8399917wjz.11.2015.09.05.00.24.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 Sep 2015 00:24:59 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Sat, 5 Sep 2015 09:24:51 +0200 Message-Id: <1441437891-6420-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] package/mono: fix linking options for locale_charset X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" * Adding a patch for proper locale_charset linking handling. * With this patch there is no need anymore for forcing libiconv as dependency, mono will now check if locale is enabled or not and acts accordingly. Fixes http://autobuild.buildroot.net/results/8d2cd5619ba4d9cec5c8ac7fef467f47abc18aea/ http://autobuild.buildroot.net/results/a3678744ded94906961430f3a4523cf1f1b0099b/ Signed-off-by: Angelo Compagnucci --- The patch was submitted upstream, I will care of remove it when it will included. ...glib-checking-for-locale_charset-function.patch | 28 ++++++++++++++++++++++ package/mono/Config.in | 1 - 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 package/mono/0005-eglib-checking-for-locale_charset-function.patch diff --git a/package/mono/0005-eglib-checking-for-locale_charset-function.patch b/package/mono/0005-eglib-checking-for-locale_charset-function.patch new file mode 100644 index 0000000..52d5638 --- /dev/null +++ b/package/mono/0005-eglib-checking-for-locale_charset-function.patch @@ -0,0 +1,28 @@ +From 026a8c44d332b3595814ce0aceba255467cd7b6d Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Sat, 5 Sep 2015 08:57:21 +0200 +Subject: [PATCH] eglib: checking for locale_charset function + +This patch checks if locale_charset function is availabe in +libiconv or libcharset and changes the linking options accordingly. + +Signed-off-by: Angelo Compagnucci +--- + eglib/configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eglib/configure.ac b/eglib/configure.ac +index 9d094ea..5ea220e 100644 +--- a/eglib/configure.ac ++++ b/eglib/configure.ac +@@ -182,6 +182,7 @@ fi + AC_SUBST(G_HAVE_ISO_VARARGS) + + AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h) ++AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+="-liconv -lcharset"])]) + AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0]) + AC_SUBST(HAVE_ALLOCA_H) + +-- +1.9.1 + diff --git a/package/mono/Config.in b/package/mono/Config.in index 0f57703..cf18a03 100644 --- a/package/mono/Config.in +++ b/package/mono/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_MONO depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help An open source, cross-platform, implementation of C# and the CLR that is binary compatible with Microsoft.NET.