From patchwork Fri Oct 16 20:19:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1383527 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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.a=rsa-sha256 header.s=20161025 header.b=G0QWDEnA; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCcv52XWfz9sTv for ; Sat, 17 Oct 2020 07:19:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A6C1D883F9; Fri, 16 Oct 2020 20:19:26 +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 tCvGUdkp8I7a; Fri, 16 Oct 2020 20:19:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2347F88497; Fri, 16 Oct 2020 20:19:26 +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 3D0B61BF312 for ; Fri, 16 Oct 2020 20:19:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 354C6883F9 for ; Fri, 16 Oct 2020 20:19:25 +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 kCTDWARH+ABo for ; Fri, 16 Oct 2020 20:19:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6690B882BE for ; Fri, 16 Oct 2020 20:19:24 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id e23so3569567wme.2 for ; Fri, 16 Oct 2020 13:19:24 -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=4/u042Wu03KDcZaN5pEzH1UK3bNGZJE+Kb0vnuPaY9Y=; b=G0QWDEnAUYBAm6Kq6I6aNfKfo3vLqCjnIfh+41picWRYEm4AFaOE8iv+i8N0ohdRqn A6LibF+lPyvrxiOiDykOJqQ4brUp0iHBvM1aagmnuTL8VibbeK+q6td7HiGi0nhSwIBi pGDkIZUqGrXeHrkKLvPxJJwGboSQoCJxIG2zTG6enFRGfY4dB7ZHGwB5tFlH8XjlEagW NOLD5ppvF/lRYe/wBfhxRIo0w/+jgl4rS+2dtQ3QFe0mmxgQzNWBk4Tgk8S2877jWyqJ tu4ANTq3bg3wcrKp1W+SBbL9RsycE056L8ekmxuU1ZTmE5Tm68ZrLoaXZQM6MhhYAHbW viCw== 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=4/u042Wu03KDcZaN5pEzH1UK3bNGZJE+Kb0vnuPaY9Y=; b=uHWJL9B9cDreZ1LgEGmruSDH+uM55tfjPm07E0m9ozO0CJ94SF4zCiyu4F+FXLXB7r K1IavACtZRoxHFwWA4NMhZZxrp7erY1H5er2uCRHSHdLInddJHbLB78ENDZB310zNZYJ t6jiva0/0kc8w+vUwX1dY1uFKQ6UKIB9oaid1r6FFMJb0gvdZvNtTi45wuAun/IGCAsW yMspEG/qIq1SOqOGqa4JrstKfkzwrMfAvEfQc6uUxEuaIsP+GdeaQRQbxmVMRgn8+mIR /Q/4fV1gBUQaHjtoS1lz2Y8Ape2AF5E48lgX9TVuSbSi2WKQUsDck4HzbyrlXw2TKz3z /fTw== X-Gm-Message-State: AOAM531MWMfS+ppefpdrk7QDFgv6j3FTcCmXCRsLdNk650xoyApLQ02I xH47JCB+GDiZbRTOVxQGt6tCC/jg5PPJpg== X-Google-Smtp-Source: ABdhPJy/qGOiryexDw+5M15SOsLn0x0jmS2q7u8tpptWGNT7OyGv2WsD83S1IzJeqfN0/QGbb3kYRg== X-Received: by 2002:a1c:a541:: with SMTP id o62mr5485437wme.90.1602879562616; Fri, 16 Oct 2020 13:19:22 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id l26sm4038914wmi.39.2020.10.16.13.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 13:19:22 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 16 Oct 2020 22:19:15 +0200 Message-Id: <20201016201916.2082927-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/mpdecimal: add optional C++ dependency 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 , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Version 2.5.0 enables the new libmpdec++ library by default: http://www.bytereef.org/mpdecimal/changelog.html#version-2-5-0 Signed-off-by: Fabrice Fontaine --- package/mpdecimal/mpdecimal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk index 00aa98e693..fa310a2274 100644 --- a/package/mpdecimal/mpdecimal.mk +++ b/package/mpdecimal/mpdecimal.mk @@ -22,4 +22,10 @@ MPDECIMAL_CONF_ENV += MACHINE=ansi32 endif endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +MPDECIMAL_CONF_OPTS += --enable-cxx +else +MPDECIMAL_CONF_OPTS += --disable-cxx +endif + $(eval $(autotools-package)) From patchwork Fri Oct 16 20:19:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1383528 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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.a=rsa-sha256 header.s=20161025 header.b=SI2AA6Ja; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCcv86cdwz9sTv for ; Sat, 17 Oct 2020 07:19:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 120F4882BE; Fri, 16 Oct 2020 20:19:31 +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 cWWCdICGBukk; Fri, 16 Oct 2020 20:19:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6968788497; Fri, 16 Oct 2020 20:19:30 +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 D34221BF312 for ; Fri, 16 Oct 2020 20:19:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C9E5688497 for ; Fri, 16 Oct 2020 20:19:28 +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 p9o43FRtu2Ia for ; Fri, 16 Oct 2020 20:19:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id AA201884D4 for ; Fri, 16 Oct 2020 20:19:27 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id q5so4334741wmq.0 for ; Fri, 16 Oct 2020 13:19:27 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=JKuldHhHJfkONUd8lZkU9pGyH6A09p2l5+qk10hmatY=; b=SI2AA6JaiudktzMDvs7XYY6XQZvQPm+09RDA9cxVSlyQRI7lCe3NMZkrarCRUz956M n0yKtAmusWBFl1akeqoSXVnS48fiuCjcdbleIyaW0ZCosf5lzwTLAGZkjNw0sWGPZFBF SOfpDmLiatJ7LlZ9iR2O2CIuegsZX+uKuF+oYKd4rjUoCVUd9hpaytkJV0N0MXLuNDSl UFvUsjZdr9KPySJBkCd/i1vmJXyljhP2qXaEKUb603wPgBUTXGE5hVV9x1GVEQQhQbwJ YD/kzpL4BFv8MOU6CWP3NxiFKF2tgXtRiM5TNwjvca73BFbvThz9f/xSc9ew7WHLbbsQ jmHQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=JKuldHhHJfkONUd8lZkU9pGyH6A09p2l5+qk10hmatY=; b=el/xLa66DhC5yuZbGZATjgCFNvSNziL0LQz2rHcPLmxIPZPaMW7QVt+4P3a9j7QLiR Tz1a9lvEUIuH//lezDQ5v0jHU6z42LUMGAWCdqHdpdPDHhqFTlH9RhS2Ub5aOfiLxD6t LDhPS59w4Z2LcsVWH66fYK9o3+YwA4Dm5lMafM1EDDDmuT1Nm+X2n4UjHV6QzNeYjGu7 1kfF8opjCXgerklv4NAuksGCOsQWxZrDJ3XVJwKL6gP+qFrHTFwC5n1UXlac2tXM0Pm8 eE322M7mnCmgkZi+D9rsu/0yHpeDCNMgxgW0MMPfFMaIo4NbQhQ9943LR1zz2jJ+F6Ok JhAA== X-Gm-Message-State: AOAM530kkOeH1loHPTOS4QWpISL8vGn5ipYUIazPn+Fp5ZL8wNdZcL0p dQSt8SQ1toOqoNg4vaQN6LFsWMzzf8eKyQ== X-Google-Smtp-Source: ABdhPJy1CsbeMK0x2h+Sq8Ajp2OnCAyPUz7tZ6zvmIZMEnKco5e1yZoGueToCyz+8Mccezjid3l+hg== X-Received: by 2002:a1c:417:: with SMTP id 23mr5393574wme.1.1602879565968; Fri, 16 Oct 2020 13:19:25 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id l26sm4038914wmi.39.2020.10.16.13.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 13:19:25 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 16 Oct 2020 22:19:16 +0200 Message-Id: <20201016201916.2082927-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201016201916.2082927-1-fontaine.fabrice@gmail.com> References: <20201016201916.2082927-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/mpdecimal: fix static build 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 , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update patch to take into account the new libmpdec++ library Fixes: - http://autobuild.buildroot.org/results/40e50ffd00dacbaa697cde67846e0fc570069f56 Signed-off-by: Fabrice Fontaine --- ...ort-for-enable-disable-shared-static.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch index 4b60013840..60d6b4bb02 100644 --- a/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch +++ b/package/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch @@ -9,6 +9,8 @@ that building the shared library can be disabled in pure static library contexts. Signed-off-by: Thomas Petazzoni +[Fabrice: update for 2.5.0 (add libmpdec++)] +Signed-off-by: Fabrice Fontaine --- Makefile.in | 6 ++++++ configure.ac | 13 +++++++++++++ @@ -42,6 +44,20 @@ index 2c91891..0c44f36 100644 $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) cp -R doc/* $(DESTDIR)$(docdir) +@@ -74,9 +80,13 @@ install_libcxx: install_lib + $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) + $(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir) + $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) ++ifeq ($(BUILD_STATIC),yes) + $(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir) ++endif ++ifeq ($(BUILD_SHARED),yes) + $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir) + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) ++endif + cp -R doc/libmpdec++ $(DESTDIR)$(docdir) + + diff --git a/configure.ac b/configure.ac index 7ee8f86..2b3e505 100644 --- a/configure.ac @@ -96,6 +112,36 @@ index d9619a3..985c73c 100644 OBJS := basearith.o context.o constants.o convolute.o crt.o mpdecimal.o \ +diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in +index d9619a3..985c73c 100644 +--- a/libmpdec++/Makefile.in ++++ b/libmpdec++/Makefile.in +@@ -13,6 +13,8 @@ LIBSTATIC_CXX = @LIBSTATIC_CXX@ + LIBNAME_CXX = @LIBNAME_CXX@ + LIBSONAME_CXX = @LIBSONAME_CXX@ + LIBSHARED_CXX = @LIBSHARED_CXX@ ++BUILD_SHARED = @BUILD_SHARED@ ++BUILD_STATIC = @BUILD_STATIC@ + + CXX = @CXX@ + LDXX = @LDXX@ +@@ -39,8 +41,15 @@ ifeq ($(MAKECMDGOALS), profile_use) + MPD_LDXXFLAGS += $(MPD_PUSE) + endif + ++ifeq ($(BUILD_SHARED),yes) ++TARGETS += $(LIBSHARED_CXX) ++endif ++ ++ifeq ($(BUILD_STATIC),yes) ++TARGETS += $(LIBSTATIC_CXX) ++endif + +-default: $(LIBSTATIC_CXX) $(LIBSHARED_CXX) ++default: $(TARGETS) + + + OBJS := decimal.o -- 2.1.0