From patchwork Mon Apr 7 19:17:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucile Quirion X-Patchwork-Id: 337515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id C310E14009F for ; Tue, 8 Apr 2014 05:17:40 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6C5A8B92F; Mon, 7 Apr 2014 19:17:39 +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 NdtNIVDe-2Fe; Mon, 7 Apr 2014 19:17:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BD988B03A; Mon, 7 Apr 2014 19:17:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 271541BFA3B for ; Mon, 7 Apr 2014 19:17:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 23EE287C3A for ; Mon, 7 Apr 2014 19:17:36 +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 boM+GlIkgRnc for ; Mon, 7 Apr 2014 19:17:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [209.172.62.77]) by hemlock.osuosl.org (Postfix) with ESMTP id F08E287C29 for ; Mon, 7 Apr 2014 19:17:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id B570A10D7374 for ; Mon, 7 Apr 2014 15:17:33 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NwFyZiJEvRXA; Mon, 7 Apr 2014 15:17:29 -0400 (EDT) Received: from localhost (mtl.savoirfairelinux.net [208.88.110.46]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 7A99010D737F; Mon, 7 Apr 2014 15:17:29 -0400 (EDT) From: Lucile Quirion To: buildroot@buildroot.org Date: Mon, 7 Apr 2014 15:17:24 -0400 Message-Id: <1396898244-12852-1-git-send-email-lucile.quirion@savoirfairelinux.com> X-Mailer: git-send-email 1.9.0 Subject: [Buildroot] [PATCH 1/1] cppcms: fix build with uClibc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net This patch modifies the cppcms package in order to support uClibc-based toolchains. The booster library by default compiles with the posix backend under Linux, but this needs monetary.h which isn't provided by uClibc, so work around that with the help of the DISABLE_POSIX_LOCALE configure option. Signed-off-by: Lucile Quirion --- package/cppcms/Config.in | 6 ++---- package/cppcms/cppcms.mk | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in index c88ae1e..2b99b52 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -4,8 +4,6 @@ config BR2_PACKAGE_CPPCMS select BR2_PACKAGE_PCRE select BR2_PACKAGE_LIBGCRYPT depends on BR2_INSTALL_LIBSTDCPP - # cppcms uses which doesn't exist in uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC help CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed for Rapid Web Application Development. It @@ -33,5 +31,5 @@ config BR2_PACKAGE_CPPCMS_ICU endif -comment "cppcms needs an (e)glibc toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC +comment "cppcms needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index 4068df7..206b30f 100644 --- a/package/cppcms/cppcms.mk +++ b/package/cppcms/cppcms.mk @@ -18,6 +18,11 @@ CPPCMS_CONF_OPT += -DDISABLE_ICONV=ON CPPCMS_DEPENDENCIES += icu endif +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +# posix backend needs monetary.h which isn't available on uClibc +CPPCMS_CONF_OPT += -DDISABLE_POSIX_LOCALE=on +endif + # We copy cppcms_tmpl_cc from staging to host because this file can be # needed for compiling packages using cppcms. And it is not worth # creating a host package just for a python script.