From patchwork Fri Jul 13 17:42:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 943752 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.136; helo=silver.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="JAFENr77"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41S0Wq0mXvz9s2x for ; Sat, 14 Jul 2018 03:43:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EE0C72D944; Fri, 13 Jul 2018 17:42:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mAaVGBXNFSaA; Fri, 13 Jul 2018 17:42:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 41E032D83C; Fri, 13 Jul 2018 17:42:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E7D9F1CEBE8 for ; Fri, 13 Jul 2018 17:42:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E54AA2D83C for ; Fri, 13 Jul 2018 17:42:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5WpCLZYgK4DB for ; Fri, 13 Jul 2018 17:42:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by silver.osuosl.org (Postfix) with ESMTPS id 1BA452CE90 for ; Fri, 13 Jul 2018 17:42:58 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id i139-v6so9503425wmf.4 for ; Fri, 13 Jul 2018 10:42:58 -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; bh=KZ7nC9I5t6aRzNFTFpa9bhOxZ/KHKe6YPmcM6cTx+LQ=; b=JAFENr77dQkiQupyQ0UdBkjsS4ccC5eoh1KfIwZ26g0LbhJEp3+xEPSazvJuTEdXES y2Rqo7poIv/H3s8dHM+JuUJSMJgx9QA4kilbTooAzEvJPQRC0sUv42o41O1BdJ/TOakw VoodJRIUTXmX33g7legwTapC2SBJMPtgXHrimLd4jC73Oq5WoDs5CMYh4IQFv6hhKJkS UYhlnBJ3a/LuTtko02pyKy20GwK6aoPKDxhJaqoaVVI9AgTGsc8QTQ7mV6hZ6Jz+wvxN Vv9BBCsn4GSvV5v18PEriKla8puG3c9bKKPuuq5+q2zoiDIzPB1LGSG9xTrxab9DKECR GA5g== 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; bh=KZ7nC9I5t6aRzNFTFpa9bhOxZ/KHKe6YPmcM6cTx+LQ=; b=LVxOXdQFAO9SM67tcLO4ggGV7HPkp2cMqguK9uWEvjnOFSUt5+DgrNEqt1ogQxyaRG rE1HkZ7BFPL4NMMvRW/VvOlJUVLQPIKEE4HZVqm0rkFa0wdybpBNy+CqNBbuXdfv0Cj5 aaaWnE5KunRPC+u/apipY+iugy1o/O8GMH16lLclEpkhwl1pZXD/Z90O/tw/VAlCNW9o Cm3nusH2ixGKj2cNj9z9f+msyKZBymnJ9DkMuhBbsWvkZarA9K1Jn/2uR7hIpgWAkchz Jy9bvS8jUcxmzinxpC5FR2i8Eb+6/jNFpwaPxm4Pww7rwfrTW42Qv5n2L2o0mrVVlDu7 K+0A== X-Gm-Message-State: AOUpUlEIhbXjf02DAII+/SpF4A75loluaDG9qTSY3uCAlYoGuDsxPnmF /4FbkRuOesdQWPblFdxqePPu/Q== X-Google-Smtp-Source: AAOMgpfgOx3yEZjBPKIWFRtNYv6xvGMcs3sNS6ZPRdE+qxqiSXNgFjYkyu4ykC21xDvMZbhKguR/SQ== X-Received: by 2002:a1c:ec9d:: with SMTP id h29-v6mr4648323wmi.94.1531503776342; Fri, 13 Jul 2018 10:42:56 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-273-34.w109-218.abo.wanadoo.fr. [109.218.73.34]) by smtp.gmail.com with ESMTPSA id f2-v6sm23086594wre.16.2018.07.13.10.42.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 10:42:55 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 13 Jul 2018 19:42:47 +0200 Message-Id: <20180713174247.4005-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] boost: correctly disable icu in locale if needed X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" boost doesn't take into account --without-icu flag and links libboost_locale with icu if it founds it in staging directory So use boost.locale.icu to fix this issue Signed-off-by: Fabrice Fontaine --- package/boost/boost.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index b2605a70b7..242b60a460 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -116,6 +116,12 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOOST_OPTS += boost.locale.posix=off endif +ifeq ($(BR2_PACKAGE_ICU),y) +BOOST_OPTS += boost.locale.icu=on +else +BOOST_OPTS += boost.locale.icu=off +endif + BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv) endif