From patchwork Sat Oct 26 15:29:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1184744 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.b="Uk8je0Vi"; 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 470lKj24WJz9sPV for ; Sun, 27 Oct 2019 02:30:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 41C4C8618E; Sat, 26 Oct 2019 15:30:15 +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 Hbnnhn19KObN; Sat, 26 Oct 2019 15:30:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 43A16861A4; Sat, 26 Oct 2019 15:30:14 +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 41D951BF404 for ; Sat, 26 Oct 2019 15:30:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3E9502040D for ; Sat, 26 Oct 2019 15:30:11 +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 Lrdxz9d+fjHI for ; Sat, 26 Oct 2019 15:30:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by silver.osuosl.org (Postfix) with ESMTPS id 57BE6203DA for ; Sat, 26 Oct 2019 15:30:09 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id g24so5126324wmh.5 for ; Sat, 26 Oct 2019 08:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=veYpAWlJaZ6UYTXb6W9tQ60riekaU3ZWR8FmO7weo2Q=; b=Uk8je0Vi7d1ED8OZ0t1cVHfgZRaphDmQRFR7hrC7oZ2ZsY171U9RwVd85n38ZHz7Y0 KLIWkVbB2JpiCxqzGLg61939tu69XxcDziULfMSUv2TwZ0xDtLbCmdZ/A3YoOD43wAHl UOs/vQQnqmBRQRN10OXiLapXKJHbL2sqZ9cK02u4YvImCUrMRAUyVhLzX9Q+6x3icWM1 lHiQoXXQJOXqnMBC1ho0gIN6r30lAVc4TAfKgI6l4BFE/Axnk+/UUkuWOx0HQIF/cq6u ROoKR44mPDt7goOXvYlS2WKH0sCXNT+kbdSJcSGsAv+w6vUM5/XIQK8hCDswbatKTfvU UVGA== 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=veYpAWlJaZ6UYTXb6W9tQ60riekaU3ZWR8FmO7weo2Q=; b=Q7wS518ReMx7A5U2PjZi2VqPISxm9QcnEIEKX20BvJAXYumb03v49dQR+6Fok0CATi GjsZWvLCHRbn3ZT35yVnkRMQ2cX8dWq0SSgAAOIWvcYLrN4FLsGx6eW18vgBgK2qQ4+q XgPntOFUhs3GqM3WKFbA+MK9dshlUScJ75dve3spHIxqyJmNO5sL024ydlkmMOUQbEWB 8tpD13QgqrTky79QHVzTy2ghKiBdqmGKIuiLw+g7g8TJD/LrokBsrcAylAl0WnQ3GjGF QP1fN1Ji56d8dHb/fCBWJGR6r5d2mo2IIicqDrFFOT7l5hLkBm2+58yVt9WHViYAVXZ0 ZIDw== X-Gm-Message-State: APjAAAUHMNmEe4JZx5gORAtk4XWzFIIU9NO1nLjsDCe5TPz4ehqqyAiB +bXVuut7GfFzZCcD8nIbu/rkvukZPGwKhZcQ X-Google-Smtp-Source: APXvYqweDbB8sAV31OgdQDjgNgNhpkS+boOa9xHzuCpsMF6XMAdlaIYbKhRkzJ6gQeWY8Tm7p87WBw== X-Received: by 2002:a1c:4c02:: with SMTP id z2mr8511133wmf.78.1572103807269; Sat, 26 Oct 2019 08:30:07 -0700 (PDT) Received: from taurus.dhcp.lyon.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id p17sm7253645wrn.4.2019.10.26.08.30.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 08:30:06 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 26 Oct 2019 17:29:40 +0200 Message-Id: <20191026152943.122511-2-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191026152943.122511-1-titouan.christophe@railnova.eu> References: <20191026152943.122511-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/4] package/python-psutil: add host variant 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: Geoffrey Ragot , Peter Korsgaard , Asaf Kahlon , Titouan Christophe , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Fabrice Fontaine host-python-psutil for host-python3 is needed for mongodb >= 4.1.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Titouan Christophe --- package/python-psutil/python-psutil.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index bb4d58930f..9b8cc883bc 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -11,4 +11,8 @@ PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE +# Needed to build mongodb +HOST_PYTHON_PSUTIL_NEEDS_HOST_PYTHON = python3 + $(eval $(python-package)) +$(eval $(host-python-package)) From patchwork Sat Oct 26 15:29:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1184747 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=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.b="hm5VOK5y"; 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 470lKq1B4bz9sPV for ; Sun, 27 Oct 2019 02:30:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BB0E687364; Sat, 26 Oct 2019 15:30:16 +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 DF4A5ggthqy0; Sat, 26 Oct 2019 15:30:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1EE8D8774C; Sat, 26 Oct 2019 15:30:15 +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 739A31BF404 for ; Sat, 26 Oct 2019 15:30:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 708A087134 for ; Sat, 26 Oct 2019 15:30:12 +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 aWKRI-h4kk3g for ; Sat, 26 Oct 2019 15:30:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by hemlock.osuosl.org (Postfix) with ESMTPS id EA6418704A for ; Sat, 26 Oct 2019 15:30:10 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id v9so5490809wrq.5 for ; Sat, 26 Oct 2019 08:30:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R7QzFI6vwCm1i8yUw26XPjrKo/UyAxvKEDjRTvy0Pog=; b=hm5VOK5ynA1THj0qg1G7dtvHi+HR46vsEWl+5TgO08HLJLbZFJeqGdKSvhu7ujBxKk /V06oqXB+sBA7PYutT+Kt/q86Us+QAEU1SbflkVXRPhbg1MbB0E8wHex8jh6sUMr9wHP zkohcSGIhU8kAa/MRHaLLlLtZ8Ly+sYfG/aMkVM+1Bmp3PWxv6zH20iMiLWLXfZCt4o2 /RviJxprJMAJ/8HbB+S7Ymz7GaduzMs1HmItCAaqYYPPjU4rNAzx8vTWuIY926qMrQAi JcrArW01w4xT2sKFO2AQOSrAj8A/KS4hkC4ETDuNSccXAG66OHaVVWQCWD6Dam0YO8Um eBrw== 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=R7QzFI6vwCm1i8yUw26XPjrKo/UyAxvKEDjRTvy0Pog=; b=cmJRGQ8Hkh6GjQ62ANaMMBdQACMCABk96wby5QSH56LyXc68U108r0Cn7MdIDogYnA XOzt5Abx4qAu0YgY/s3YNhpN5urUtvjRo1xMSfspp1UdvePd2UDwl8X/Vif+JCJKUrKh ha9nKw44KxBczYP7BuoRIGkCTR4EZ0unqjlNnwAe3KB3Usc67XyPcgf69WVSUeDWBq2d 6DMZQl13OTt7J/XdcbF7yA7xSesnlGVKuDKVNabjU/1iPmjIW4TL4HbR+scqvdhJEkSh YlHLMFG4jPN+GLHOWE6e8vd9ByLohias1rrsbKOgEOjJoPjSeil6XGFsYFZpm41SLNpY USUQ== X-Gm-Message-State: APjAAAU8g3QvDd28VUkRniCuMo4AqpHV8kiYMtt/z7mzNzNlL1SnE/yV NB53ccKi00IyieYz2JIwNqTaBDeiu8uczQMP X-Google-Smtp-Source: APXvYqynjPQ5e4G22c9eipV7EtpKWN+JkMvVUq3sHmp8S+NwP8TP29Topg8EOgijiHsaAaK9H+3AcA== X-Received: by 2002:adf:f90f:: with SMTP id b15mr7850338wrr.76.1572103808915; Sat, 26 Oct 2019 08:30:08 -0700 (PDT) Received: from taurus.dhcp.lyon.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id p17sm7253645wrn.4.2019.10.26.08.30.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 08:30:08 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 26 Oct 2019 17:29:41 +0200 Message-Id: <20191026152943.122511-3-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191026152943.122511-1-titouan.christophe@railnova.eu> References: <20191026152943.122511-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] package/python-cheetah3: new package 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: Geoffrey Ragot , Peter Korsgaard , Asaf Kahlon , Titouan Christophe , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Fabrice Fontaine host-python-cheetah3 for host-python3 is required for mongodb 4.1.10 Signed-off-by: Fabrice Fontaine [Titouan: Fix comment line contains UTF-8 characters] Signed-off-by: Titouan Christophe --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-cheetah3/Config.in | 6 ++++++ package/python-cheetah3/python-cheetah3.hash | 5 +++++ package/python-cheetah3/python-cheetah3.mk | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/python-cheetah3/Config.in create mode 100644 package/python-cheetah3/python-cheetah3.hash create mode 100644 package/python-cheetah3/python-cheetah3.mk diff --git a/DEVELOPERS b/DEVELOPERS index b9e6881419..952b49fa17 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -867,6 +867,7 @@ F: package/oniguruma/ F: package/oprofile/ F: package/pcmanfm/ F: package/python-backcall/ +F: package/python-cheetah3/ F: package/python-jedi/ F: package/python-parso/ F: package/rygel/ diff --git a/package/Config.in b/package/Config.in index 901c25fe02..9a22aa1e52 100644 --- a/package/Config.in +++ b/package/Config.in @@ -860,6 +860,7 @@ menu "External python modules" source "package/python-characteristic/Config.in" source "package/python-chardet/Config.in" source "package/python-cheetah/Config.in" + source "package/python-cheetah3/Config.in" source "package/python-cheroot/Config.in" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" diff --git a/package/python-cheetah3/Config.in b/package/python-cheetah3/Config.in new file mode 100644 index 0000000000..9c5761f556 --- /dev/null +++ b/package/python-cheetah3/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CHEETAH3 + bool "python-cheetah3" + help + Cheetah is a template engine and code generation tool. + + http://cheetahtemplate.org/ diff --git a/package/python-cheetah3/python-cheetah3.hash b/package/python-cheetah3/python-cheetah3.hash new file mode 100644 index 0000000000..67f4a720db --- /dev/null +++ b/package/python-cheetah3/python-cheetah3.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/cheetah3/json +md5 e0cbd10b6fa0d4b294f7fb6453d85a2a Cheetah3-3.2.1.tar.gz +sha256 685f961d2761e140bfea67156a013313acda66a229edc6c8708b71d9080ece9c Cheetah3-3.2.1.tar.gz +# Locally computed sha256 checksums +sha256 21b356594daaefc1b482b7f7ef2b7a83910c95ebd49d7170ce6ec5a18f084442 LICENSE diff --git a/package/python-cheetah3/python-cheetah3.mk b/package/python-cheetah3/python-cheetah3.mk new file mode 100644 index 0000000000..38a0921297 --- /dev/null +++ b/package/python-cheetah3/python-cheetah3.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python-cheetah3 +# +################################################################################ + +PYTHON_CHEETAH3_VERSION = 3.2.1 +PYTHON_CHEETAH3_SOURCE = Cheetah3-$(PYTHON_CHEETAH3_VERSION).tar.gz +PYTHON_CHEETAH3_SITE = https://files.pythonhosted.org/packages/d8/49/25d1d310c274433e1bc82736483f2c57f870688deddb0c56f296dcfe36f7 +PYTHON_CHEETAH3_SETUP_TYPE = setuptools +PYTHON_CHEETAH3_LICENSE = MIT +PYTHON_CHEETAH3_LICENSE_FILES = LICENSE + +# Needed to build mongodb +HOST_PYTHON_CHEETAH3_NEEDS_HOST_PYTHON = python3 + +$(eval $(python-package)) +$(eval $(host-python-package)) From patchwork Sat Oct 26 15:29:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1184748 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=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.b="giQQxvfr"; 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 470lKs2P4sz9sPV for ; Sun, 27 Oct 2019 02:30:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A2A12874E4; Sat, 26 Oct 2019 15:30:22 +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 owftc7AX9wjp; Sat, 26 Oct 2019 15:30:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CB4C6875B2; Sat, 26 Oct 2019 15:30:21 +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 C716B1BF404 for ; Sat, 26 Oct 2019 15:30:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C2DE82041E for ; Sat, 26 Oct 2019 15:30:13 +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 zlroDHM5v5mL for ; Sat, 26 Oct 2019 15:30:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by silver.osuosl.org (Postfix) with ESMTPS id 4F895203DA for ; Sat, 26 Oct 2019 15:30:12 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id s1so5516808wro.0 for ; Sat, 26 Oct 2019 08:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m12XS2cwBJ5us3JM21b7Nf8iO132kiw+qPDw0if3JKY=; b=giQQxvfriyr0PjHwejzwJGa1smTtrDQc15zREeuj2XmZPdrGTa3kbczdMFHTZajCOn fz86+VD/rcdLaaVNjHzOaUhAaYw4k0MAjEcsBiW2u7i6Ty49V2H4vMqvYASdZFoCwC9M 0y8r9St6FpaYBwEX2Gx12TR8gURfHCGDhQ5Vb7gUdTD098JTIs+wmTLBwXXR/Vx1oI1e i9L7QJ/VvI520z1sRWsaDZHvcCHAK5Ap/g3U423rkUXNasoJkGETf6MBPhMK9+OIDb3z k4aCwH2cltAcRnmQsAb4erMDtQRPBEHeiHwI/vQvnKvsWIF2R7f0C72jTR64eVgnq5ST k34Q== 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=m12XS2cwBJ5us3JM21b7Nf8iO132kiw+qPDw0if3JKY=; b=gchLd3Q5ALsXstZtcvyEjRNqci8fauU/vIUoarhT2qJLHmZlvVHJ3EacK0pG1Xmfik Oq7avpobl3Vh3MRdZ3BT/BJKLjVyTkh+TKwwP97Q/GduM26mYSz/0xtFXfT30CdNZtZp Vz5aUkmx1GjoXUJuxMEjwHOWSQVgsBd5pemcBVDLrMCQYRi77In3sRrS86OZrcwEU7Al a6z6ZZjdlLtx9xsJ0ueyU/UJlJ44BQKm2Zthtn9s2utH8C5mcep+IrOHMdEWhzwepcAy NvWr8pcMYK2L4CrFUWVAXGXL191E/lKboZz6YB2pVyL8iiU4dDQwzG1iIkTC7I6SPP2v H7fQ== X-Gm-Message-State: APjAAAX9T7HmgtgyjKWOM18fpHvGZ3/6BDYmyGvODAfv0ANvlHaEvzZ6 0gMI8Lqk45Aj01VpAVK+xgdCNh+/h/6f2ygd X-Google-Smtp-Source: APXvYqxpTgMBfN5dQRMfdB/lXXJktHfiRui5SAZnxW4M+ST+MYDHgpZu51HbR5QLfCPvPR3nZ1hxjA== X-Received: by 2002:a5d:4a03:: with SMTP id m3mr8004399wrq.359.1572103810344; Sat, 26 Oct 2019 08:30:10 -0700 (PDT) Received: from taurus.dhcp.lyon.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id p17sm7253645wrn.4.2019.10.26.08.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 08:30:09 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 26 Oct 2019 17:29:42 +0200 Message-Id: <20191026152943.122511-4-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191026152943.122511-1-titouan.christophe@railnova.eu> References: <20191026152943.122511-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] package/python-pyyaml: add a host-python3 dependency for host variant 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: Geoffrey Ragot , Peter Korsgaard , Asaf Kahlon , Titouan Christophe , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Fabrice Fontaine host-python-pyyaml on host-python3 is needed for mongodb Signed-off-by: Fabrice Fontaine [Titouan: Fix comment line contains UTF-8 characters] Signed-off-by: Titouan Christophe --- package/python-pyyaml/python-pyyaml.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 165a938f11..e74405c065 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -13,5 +13,8 @@ PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_DEPENDENCIES = libyaml HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +# Needed to build mongodb +HOST_PYTHON_PYYAML_NEEDS_HOST_PYTHON = python3 + $(eval $(python-package)) $(eval $(host-python-package)) From patchwork Sat Oct 26 15:29:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1184749 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.b="hYhxzPeW"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 470lKx1M4rz9sPV for ; Sun, 27 Oct 2019 02:30:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3E49D20435; Sat, 26 Oct 2019 15:30:25 +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 sjXqqDbX5CHi; Sat, 26 Oct 2019 15:30:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B2CFB2040D; Sat, 26 Oct 2019 15:30:23 +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 DB5141BF404 for ; Sat, 26 Oct 2019 15:30:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D6D87203DA for ; Sat, 26 Oct 2019 15:30:14 +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 6uIb7iRTH7-r for ; Sat, 26 Oct 2019 15:30:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by silver.osuosl.org (Postfix) with ESMTPS id 9CCA42040D for ; Sat, 26 Oct 2019 15:30:13 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t16so5508577wrr.1 for ; Sat, 26 Oct 2019 08:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xt4V14ck1NCZ8YN8S/Q5H8aHXY/38Usdyzysh/9cPBA=; b=hYhxzPeWrNlBm0V7le2lJfmSFuoZ4iwXqTzg6U4AYxyTZz5XhnLA/HqaOVVmMiYBNg CtPThBLWPDeL/Mucwq+5BnSth4Kq7s2JePeQBnPDvuVl4CnUkvPUptMcbRhHc9rUP/k3 3VICtaw+vqEc4UB2RFK4EmpzZYHB1lJm746jSikMv1Ggv2PrWCWu7MD356fpEaeYk0O9 Y8uiX+Ibr4vFZX7mUISWG6i0uBeXE2/C1e6Kx008pJiglnSwlJfUzJKaJ7YGyDTr5ypq GbIbSUddD/KQFOKrJwblN3tiJkC+TmTwFGyYikXGX+W8pgejOjpZn2QZubyq7LxbW9jb veDg== 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=xt4V14ck1NCZ8YN8S/Q5H8aHXY/38Usdyzysh/9cPBA=; b=cQNTHlZc+FfgBrCervDAoJVvBFh976i5uNsAKJGV0c3gEdW6PbcN6c3G16yr45WQTw 7rgFifF1e3R0PlgrkrXCeNtD8pO0+igD95By7GT5cyp/xSuGs5YB7c233rp4KVfPRHHL wtKE18JHqwdJV3SWJt4AZ9L6evP3M3PUZDNUBczQtbKcDiKuB+2RazwrGqNlSZsLAcIt fmgI98ZHf0pn+awnu5HAdqaklQ79Vk4jNa1sz3TBMJlrJGjFKpC8KtOaaH9pacySn6qX /0M2J4QBix8m3K+B4dQNJNSMe2i9w20Hy5ui8PxlSIj9LK/OHlT4FbXXzijF0WTedwTq E8Qw== X-Gm-Message-State: APjAAAVkYeaD4HskNXQWwqNUOdxSJgL6EDOlrTqc4W3jAIWVVz2ForqP 89Eei2IPGia5SPcV34zLWQvjS15euPN0pY4h X-Google-Smtp-Source: APXvYqxF7j5QebupRWiQYOvBTbgpm1QHX/N/GSCm8er5EpDqepC0IMF3WFUB+NGU3hSiiNCKwSMhYw== X-Received: by 2002:a5d:6785:: with SMTP id v5mr3768242wru.174.1572103811673; Sat, 26 Oct 2019 08:30:11 -0700 (PDT) Received: from taurus.dhcp.lyon.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id p17sm7253645wrn.4.2019.10.26.08.30.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 08:30:11 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sat, 26 Oct 2019 17:29:43 +0200 Message-Id: <20191026152943.122511-5-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191026152943.122511-1-titouan.christophe@railnova.eu> References: <20191026152943.122511-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/4] package/mongodb: bump to version 4.1.10 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: Geoffrey Ragot , Peter Korsgaard , Asaf Kahlon , Titouan Christophe , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Fabrice Fontaine - Drop !BR2_PACKAGE_PYTHON3 dependency as SConstruct requires host-python3 since version 4.1.10 and: https://github.com/mongodb/mongo/commit/8dd6d4755734ed37c1b98dfdefce3ca6bc65f1f6 - host-python-psutil is needed since 4.1.8 and https://github.com/mongodb/mongo/commit/ff03811e31851984617d73739de8acc7640b19a2 - Drop unneeded host-python-typing dependency - C++17 and so gcc 7 is required since 4.1.8 and https://github.com/mongodb/mongo/commit/01d84b2565fc9ea9626a55dcf1f3f817968088f2 - Set --disable-minimum-compiler-version-enforcement as mongodb enforces gcc >= 8.2 since verson 4.1.8 and https://github.com/mongodb/mongo/commit/9ac90b128ebeb1bb431ebe3fe9176cb6142818cb - Explictly disable ssl if needed as ssl is enabled by default - Add host-python-cheetah3 dependency if needed - Manage new http-client option added in version 4.1.2 and https://github.com/mongodb/mongo/commit/4d7dcca91bc2bbde65843fe88c41fa040e0d1877 - Add a patch to fix build with system libraries Signed-off-by: Fabrice Fontaine [Titouan: Fix patch conflicts with master] Signed-off-by: Titouan Christophe --- ...0002-fix-build-with-system-libraries.patch | 64 +++++++++++++++++++ package/mongodb/Config.in | 8 +-- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 23 ++++--- 4 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 package/mongodb/0002-fix-build-with-system-libraries.patch diff --git a/package/mongodb/0002-fix-build-with-system-libraries.patch b/package/mongodb/0002-fix-build-with-system-libraries.patch new file mode 100644 index 0000000000..cf8b69d221 --- /dev/null +++ b/package/mongodb/0002-fix-build-with-system-libraries.patch @@ -0,0 +1,64 @@ +From 40c7112d346721a57a134bd7b3d87d797d9c1a55 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 27 Apr 2019 10:55:05 +0200 +Subject: [PATCH] fix build with system libraries + +Since commit 66430d75e33827da60195deb317058c71f75e03f which replaced all +InjectThirdPartyIncludePaths calls by InjectThirdParty calls, building +with system libraries such as --use-system-boost will fail on: + +KeyError: 'boost': + File "/home/fabrice/buildroot/output/build/mongodb-r4.1.10/SConstruct", line 3876: + variant_dir='$BUILD_DIR', + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Script/SConscript.py", line 605: + return _SConscript(self.fs, *files, **subst_kw) + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Script/SConscript.py", line 286: + exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals) + File "/home/fabrice/buildroot/output/build/mongodb-r4.1.10/src/SConscript", line 12: + env.SConscript('third_party/SConscript', exports=['env']) + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Script/SConscript.py", line 605: + return _SConscript(self.fs, *files, **subst_kw) + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Script/SConscript.py", line 286: + exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals) + File "/home/fabrice/buildroot/output/build/mongodb-r4.1.10/src/third_party/SConscript", line 161: + murmurEnv.SConscript('murmurhash3/SConscript', exports={ 'env' : murmurEnv }) + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Script/SConscript.py", line 605: + return _SConscript(self.fs, *files, **subst_kw) + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Script/SConscript.py", line 286: + exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals) + File "/home/fabrice/buildroot/output/build/mongodb-r4.1.10/src/third_party/murmurhash3/SConscript", line 5: + env.InjectThirdParty(libraries=['boost']) + File "/home/fabrice/buildroot/output/host/lib/scons-3.0.5/SCons/Environment.py", line 224: + return self.method(*nargs, **kwargs) + File "/home/fabrice/buildroot/output/build/mongodb-r4.1.10/src/third_party/SConscript", line 148: + mods = thirdPartyEnvironmentModifications[lib] + +This is due to the fact that boost is not added as an element of +thirdPartyEnvironmentModification if --use-system-boost is set + +To fix this error, catch the KeyError + +Signed-off-by: Fabrice Fontaine +--- + src/third_party/SConscript | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/third_party/SConscript b/src/third_party/SConscript +index c129f6765e..089dad7579 100644 +--- a/src/third_party/SConscript ++++ b/src/third_party/SConscript +@@ -183,7 +183,10 @@ def injectThirdParty(thisEnv, libraries=[], parts=[]): + libraries = thisEnv.Flatten([libraries]) + parts = thisEnv.Flatten([parts]) + for lib in libraries: +- mods = thirdPartyEnvironmentModifications[lib] ++ try: ++ mods = thirdPartyEnvironmentModifications[lib] ++ except KeyError: ++ continue + if not parts: + thisEnv.PrependUnique(**mods) + else: +-- +2.20.1 + diff --git a/package/mongodb/Config.in b/package/mongodb/Config.in index 9c5dba8347..493c592413 100644 --- a/package/mongodb/Config.in +++ b/package/mongodb/Config.in @@ -8,12 +8,11 @@ config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS config BR2_PACKAGE_MONGODB bool "mongodb" depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_IOSTREAMS @@ -35,9 +34,8 @@ config BR2_PACKAGE_MONGODB https://www.mongodb.org/ -comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 6" +comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on !BR2_PACKAGE_PYTHON3 diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index f08ffffe3b..c22091151e 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 b39c5b7bb77a547804ab6f43f9b5f09add47574356b31512fd1cc641a08b4ea5 mongodb-r4.0.12.tar.gz +sha256 b6e0cd151f95728276a02a9b0d86a1582b1b30d5763fd6b5c0e1a0c488e7bc67 mongodb-r4.1.10.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 22ca920e12..03c7267358 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION_BASE = 4.0.12 +MONGODB_VERSION_BASE = 4.1.10 MONGODB_VERSION = r$(MONGODB_VERSION_BASE) MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION)) @@ -13,9 +13,9 @@ MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt MONGODB_DEPENDENCIES = \ boost \ - host-python-cheetah \ + host-python-cheetah3 \ + host-python-psutil \ host-python-pyyaml \ - host-python-typing \ host-scons \ pcre \ snappy \ @@ -29,6 +29,7 @@ MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \ -j"$(PARALLEL_JOBS)" MONGODB_SCONS_OPTS = \ + --disable-minimum-compiler-version-enforcement \ --disable-warnings-as-errors \ --use-system-boost \ --use-system-pcre \ @@ -60,21 +61,27 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL),y) MONGODB_DEPENDENCIES += libcurl -MONGODB_SCONS_OPTS += --enable-free-mon=on +MONGODB_SCONS_OPTS += \ + --enable-free-mon=on \ + --enable-http-client=on else -MONGODB_SCONS_OPTS += --enable-free-mon=off +MONGODB_SCONS_OPTS += \ + --enable-free-mon=off \ + --enable-http-client=off endif ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGODB_DEPENDENCIES += openssl MONGODB_SCONS_OPTS += \ - --ssl \ + --ssl=on \ --ssl-provider=openssl +else +MONGODB_SCONS_OPTS += --ssl=off endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -82,7 +89,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python $(SCONS) \ + $(HOST_DIR)/bin/python3 $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \