All of lore.kernel.org
 help / color / mirror / Atom feed
From: Romain Naour <romain.naour@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 8/8] package/mongodb: bump to version 4.2.4
Date: Tue, 24 Mar 2020 23:06:08 +0100	[thread overview]
Message-ID: <86ddbaf6-24c8-87aa-8e5a-dd7211af5127@gmail.com> (raw)
In-Reply-To: <20200323104909.16765-8-yegorslists@googlemail.com>

Hi,

Le 23/03/2020 ? 11:49, yegorslists at googlemail.com a ?crit?:
> From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> 
> - 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-cheetah dependency if needed
> - Manage new http-client option added in version 4.1.2 and
>   https://github.com/mongodb/mongo/commit/4d7dcca91bc2bbde65843fe88c41fa040e0d1877

This series superseed the previous one from Titouan:
http://patchwork.ozlabs.org/project/buildroot/list/?series=138894

Best regards,
Romain

> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> [Titouan: Fix patch conflicts with master]
> Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
>  package/mongodb/Config.in    |  8 +++-----
>  package/mongodb/mongodb.hash |  2 +-
>  package/mongodb/mongodb.mk   | 27 ++++++++++++++++++---------
>  3 files changed, 22 insertions(+), 15 deletions(-)
> 
> 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..01793e02e9 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 033839fe43adb13351f9e0ef361d4731d7e917b2d7ad12f09df73e6e9c8bf6db  mongodb-r4.2.4.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..f7f8b4bd05 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.2.4
>  MONGODB_VERSION = r$(MONGODB_VERSION_BASE)
>  MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION))
>  
> @@ -13,9 +13,11 @@ MONGODB_LICENSE_FILES = APACHE-2.0.txt LICENSE-Community.txt
>  
>  MONGODB_DEPENDENCIES = \
>  	boost \
> -	host-python-cheetah \
> -	host-python-pyyaml \
> -	host-python-typing \
> +	host-python3-cheetah \
> +	host-python3-psutil \
> +	host-python3-pyyaml \
> +	host-python3-regex \
> +	host-python3-requests \
>  	host-scons \
>  	pcre \
>  	snappy \
> @@ -29,6 +31,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 +63,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 +91,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 \
> 

  reply	other threads:[~2020-03-24 22:06 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23 10:49 [Buildroot] [PATCH 1/8] package/python-psutil: add host variant yegorslists at googlemail.com
2020-03-23 10:49 ` [Buildroot] [PATCH 2/8] package/python-regex: new package yegorslists at googlemail.com
2020-04-24 12:58   ` Thomas Petazzoni
2020-03-23 10:49 ` [Buildroot] [PATCH 3/8] package/python3-regex: add special package variant for the host build yegorslists at googlemail.com
2020-03-24 21:50   ` Romain Naour
2020-04-24 12:59   ` Thomas Petazzoni
2020-03-23 10:49 ` [Buildroot] [PATCH 4/8] package/python3-cheetah: add special host variant yegorslists at googlemail.com
2020-04-24 13:00   ` Thomas Petazzoni
2020-03-23 10:49 ` [Buildroot] [PATCH 5/8] package/python3-requests: " yegorslists at googlemail.com
2020-04-25  9:58   ` Thomas Petazzoni
2020-03-23 10:49 ` [Buildroot] [PATCH 6/8] package/python3-pyyaml: " yegorslists at googlemail.com
2020-04-21 20:00   ` Ryan Barnett
2020-04-23  6:55     ` Yegor Yefremov
2020-04-25  9:59   ` Thomas Petazzoni
2020-03-23 10:49 ` [Buildroot] [PATCH 7/8] package/python3-psutil: add a " yegorslists at googlemail.com
2020-04-25 12:02   ` Thomas Petazzoni
2020-03-23 10:49 ` [Buildroot] [PATCH 8/8] package/mongodb: bump to version 4.2.4 yegorslists at googlemail.com
2020-03-24 22:06   ` Romain Naour [this message]
2020-04-20 22:56   ` Ryan Barnett
2020-04-21 16:05     ` Ryan Barnett
2020-04-21 18:38       ` Fabrice Fontaine
2020-04-21 19:38         ` [Buildroot] [External] " Ryan Barnett
2020-04-25 12:02   ` [Buildroot] " Thomas Petazzoni
2020-04-24 12:57 ` [Buildroot] [PATCH 1/8] package/python-psutil: add host variant Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=86ddbaf6-24c8-87aa-8e5a-dd7211af5127@gmail.com \
    --to=romain.naour@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.