From patchwork Sat Aug 15 12:46:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 507630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id BD8671401AD for ; Sat, 15 Aug 2015 22:46:54 +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=a1Mz4od2; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 266CF8AC50; Sat, 15 Aug 2015 12:46:53 +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 D1Q5r3YjVlYz; Sat, 15 Aug 2015 12:46:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E648A8AC3D; Sat, 15 Aug 2015 12:46:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 710761C1F12 for ; Sat, 15 Aug 2015 12:46:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6B9B88A629 for ; Sat, 15 Aug 2015 12:46:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FQmukqW6AwGL for ; Sat, 15 Aug 2015 12:46:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by hemlock.osuosl.org (Postfix) with ESMTPS id 76EBA8A622 for ; Sat, 15 Aug 2015 12:46:49 +0000 (UTC) Received: by wicja10 with SMTP id ja10so43537134wic.1 for ; Sat, 15 Aug 2015 05:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=kWFcL5FVv5nSti0xUOHOCQzuX7wq/LkxLJwSogwlYbQ=; b=a1Mz4od2UqaUk2dKephUFVXLopW9FxIIQvfHWmWS3LM+9t/ync9Nf8C4AsBQDQ2Dlm xdU+4z1serObc1bCJqNn72nstkHs03DqZ3mKTvxtrm8yvPL+dy6EA+ysn3Y0oHKEl/zo XhITgm2/3M4KVa4aDpZ2BZ+ZGJ/yGeID598xT9lff4xE6Y7cPFs6tFlOYLDjxB5K6cx+ Y3vPGho6zPKEEHZYKrKqlgI9DYQYxq6PpWF3jpw1IshOIAlnv7Bc39xlXfcDlUjOOFOq J0wE3GsLDzwzo5+WHxFNAH8BNUm48wNuKLk/MeEH49noVYjHqnMZzFPNhrSwHzh3UaKB hvXA== X-Received: by 10.180.84.230 with SMTP id c6mr16753574wiz.32.1439642807973; Sat, 15 Aug 2015 05:46:47 -0700 (PDT) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id bi6sm12782135wjc.25.2015.08.15.05.46.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Aug 2015 05:46:47 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 15 Aug 2015 14:46:42 +0200 Message-Id: <1439642802-9968-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH] package/beecrypt: fix C++ support 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" C++ support unconditionally needs shared libraries; it uses dlopen/dlsym. Also, fix the conditions under which the comment is shown. Finally, explicitly require C++ support when configuring. Signed-off-by: "Yann E. MORIN" --- package/beecrypt/Config.in | 6 ++++-- package/beecrypt/beecrypt.mk | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in index b9685ef..fc93a77 100644 --- a/package/beecrypt/Config.in +++ b/package/beecrypt/Config.in @@ -17,13 +17,15 @@ config BR2_PACKAGE_BEECRYPT_CPP depends on BR2_USE_WCHAR # icu depends on !BR2_BINFMT_FLAT # icu depends on BR2_ARCH_HAS_ATOMICS # icu + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ICU help Enable C++ support. This pulls in the (large) icu package. -comment "C++ support needs a toolchain w/ wchar" +comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries" depends on !BR2_BINFMT_FLAT depends on BR2_ARCH_HAS_ATOMICS - depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || BR2_STATIC_LIBS endif # BR2_PACKAGE_BEECRYPT diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk index cd0b4ac..e66cec1 100644 --- a/package/beecrypt/beecrypt.mk +++ b/package/beecrypt/beecrypt.mk @@ -19,6 +19,7 @@ BEECRYPT_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y) BEECRYPT_DEPENDENCIES += icu +BEECRYPT_CONF_OPTS += --with-cplusplus else BEECRYPT_CONF_OPTS += --without-cplusplus