From patchwork Tue Jun 11 18:55:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1114182 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EmdBLITZ"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45NfN870T6z9s9y for ; Wed, 12 Jun 2019 04:55:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EA62C875B1; Tue, 11 Jun 2019 18:55:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q9-iWd5aTZa9; Tue, 11 Jun 2019 18:55:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 078E4875A2; Tue, 11 Jun 2019 18:55:49 +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 25F511BF425 for ; Tue, 11 Jun 2019 18:55:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2348D85F79 for ; Tue, 11 Jun 2019 18:55:48 +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 tU3yJFDemvTi for ; Tue, 11 Jun 2019 18:55:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8B5FC85F75 for ; Tue, 11 Jun 2019 18:55:46 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id n4so14236304wrs.3 for ; Tue, 11 Jun 2019 11:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9VovHuIsc7W2AvjeLF5h1R/UMlYT+v2pqIOz910ucZ8=; b=EmdBLITZjEWoKxDuwETphrrXalD7ZPytT44CY/O5YgTqo1DKOSTZ3Rg/9gQQJMbT39 W4MOUAUgXBALhx2UGwTexaSUnT0VWybi/8dqMzxQRtlxYFcU12mk4ArLXi6h6iAbPLdw kNndugdx268TVeqTBFRq+enEyku6LOtOUu2idf/flf4AHFhPduToqGPljhbGYMJuCBe7 dIXBxyx96KPfi5oIuRxgKWri41PxiuXtPXILPEuQDxEMx4oGBPyVX0J0phwdI1emASqY zc5DWfReiaTG+eLwz4pBj8ebneSp42du2nSEsxixwPcY3UD8pAiKxxfjPHUATUu1yt0d UcJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9VovHuIsc7W2AvjeLF5h1R/UMlYT+v2pqIOz910ucZ8=; b=YV3BEUQwEccXYTYrfQKjMqmupy54DstAisb4oKFg8B6n1aV4d5WrUD5tHqiEG3aJgc G+30uoyZPSfm4sMBFn2pzNzLqyITdvjMwneZC0Py4t+uhCjvISkoB3p+p6i+abbTfoKC lntVOf2mr7MaSign0tJN7jVfvskPwnd/4LhhcGhAmAPvxTk+GcHuOaJGdqjG01pHvd7U +hsdog8tYWfKaSD3WLZ9P2hJC/cPvNH0GVgDsCFyGAwTqX7B5LpkbH4phwXGt9BNGtLE tlnzwLNNTqZEwNbhs8c5G2wOztfeGhQji+dPVzZF5XUUaQeEak6/1Kd+g/mcnNKwq8ph TuYg== X-Gm-Message-State: APjAAAWSawRiY88xPcwvjb3pNpn1mPv2kd8rJtgPr3LQrat49XxV4APw ktO1EnI55Ug1cz7OvxYWjUTApDbCCbY= X-Google-Smtp-Source: APXvYqwNA0tM7QwK+XrOtcFnf8snnboh0W13VqNmNnVIGU2366pI0gWpWHm3nT8erptEQeda72H9Mg== X-Received: by 2002:adf:eb4e:: with SMTP id u14mr4110408wrn.168.1560279344732; Tue, 11 Jun 2019 11:55:44 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id q9sm4792957wmq.9.2019.06.11.11.55.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 11 Jun 2019 11:55:43 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 11 Jun 2019 20:55:42 +0200 Message-Id: <20190611185542.21391-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libglib2: fix build with NLS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" cc_has_function('ngettext') is broken when cross-compiling, see: https://github.com/mesonbuild/meson/issues/3740 As a result, a false positive is returned and build fails because of the missing lintl dependency Fixes: - http://autobuild.buildroot.org/results/f0d85d76786343d767fba9c7c5c01f042ecfc018 Signed-off-by: Fabrice Fontaine --- ...005-meson.build-fix-build-with-lintl.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/libglib2/0005-meson.build-fix-build-with-lintl.patch diff --git a/package/libglib2/0005-meson.build-fix-build-with-lintl.patch b/package/libglib2/0005-meson.build-fix-build-with-lintl.patch new file mode 100644 index 0000000000..5abe87b32a --- /dev/null +++ b/package/libglib2/0005-meson.build-fix-build-with-lintl.patch @@ -0,0 +1,52 @@ +From d1b5dc6ffc8dde4c413c832e178b758cdf3b4187 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 11 Jun 2019 20:40:44 +0200 +Subject: [PATCH] meson.build: fix build with lintl + +cc_has_function('ngettext') is broken when cross-compiling, see: +https://github.com/mesonbuild/meson/issues/3740 + +As a result, a false positive is returned and build fails because of the +missing lintl dependency + +Fixes: + - http://autobuild.buildroot.org/results/f0d85d76786343d767fba9c7c5c01f042ecfc018 + +Signed-off-by: Fabrice Fontaine +--- + meson.build | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b85ff7661..5b22fcfd2 100644 +--- a/meson.build ++++ b/meson.build +@@ -1785,10 +1785,12 @@ endif + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. +-if cc.has_function('ngettext') +- libintl = [] +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') +-else ++# FIXME: cc.has_function('ngettext') is broken when cross-compiling, see ++# https://github.com/mesonbuild/meson/issues/3740 ++#if cc.has_function('ngettext') ++# libintl = [] ++# have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') ++#else + libintl = cc.find_library('intl', required : false) + if not libintl.found() + libintl = subproject('proxy-libintl').get_variable('intl_dep') +@@ -1797,7 +1799,7 @@ else + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', + dependencies : libintl) + endif +-endif ++#endif + + glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) + +-- +2.20.1 +