From patchwork Sat Apr 11 20:11:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1269376 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=none (p=none dis=none) header.from=t-online.de 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 4905d90jBWz9sSG for ; Sun, 12 Apr 2020 06:11:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 65E7086E4E; Sat, 11 Apr 2020 20:11:51 +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 x9pckT3CjIhW; Sat, 11 Apr 2020 20:11:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5EDE58682C; Sat, 11 Apr 2020 20:11:47 +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 BF2FD1BF399 for ; Sat, 11 Apr 2020 20:11:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B7D892036C for ; Sat, 11 Apr 2020 20:11:45 +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 lJx06QJA8WQ1 for ; Sat, 11 Apr 2020 20:11:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by silver.osuosl.org (Postfix) with ESMTPS id 8709A20034 for ; Sat, 11 Apr 2020 20:11:42 +0000 (UTC) Received: from fwd03.aul.t-online.de (fwd03.aul.t-online.de [172.20.27.148]) by mailout07.t-online.de (Postfix) with SMTP id 2292B42C7560; Sat, 11 Apr 2020 22:11:40 +0200 (CEST) Received: from fli4l.lan.fli4l (r1QqdwZvwhckigXM72N5J4u12oj33kcWBQA8ESoBKTG06eMdSKYmcNN7ywb5NRNQ6G@[79.214.203.16]) by fwd03.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1jNMTV-4c3oQa0; Sat, 11 Apr 2020 22:11:33 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:57012) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1jNMTU-00062v-6P; Sat, 11 Apr 2020 22:11:33 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 11 Apr 2020 22:11:32 +0200 Message-Id: <20200411201132.249731-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-ID: r1QqdwZvwhckigXM72N5J4u12oj33kcWBQA8ESoBKTG06eMdSKYmcNN7ywb5NRNQ6G X-TOI-MSGID: daee5289-30a5-465b-8c57-7fe908a70682 Subject: [Buildroot] [PATCH v2 1/1] package/python3: add optional support for berkeleydb 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: Thomas Petazzoni , Asaf Kahlon , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- v2: added patch to explicitly disable the build of the dbm module (Thomas) ...ion-to-disable-the-berkeleydb-module.patch | 30 +++++++++++++++++++ package/python3/Config.in | 6 ++++ package/python3/python3.mk | 6 ++++ 3 files changed, 42 insertions(+) create mode 100644 package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch diff --git a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch new file mode 100644 index 0000000000..f763fcaa82 --- /dev/null +++ b/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -0,0 +1,30 @@ +From cf4d7fd9f7cb6c1ced32ee323b2b5755640051b7 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 11 Apr 2020 22:01:40 +0200 +Subject: [PATCH] Add an option to disable the berkeleydb module + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 72c1d86e82..8c3912d237 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3326,6 +3326,12 @@ if test "$UUID" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" + fi + ++AC_ARG_ENABLE(berkeleydb, ++ AS_HELP_STRING([--disable-berkeleydb], [disable berkeleydb]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _dbm" ++ fi]) ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.25.0 + diff --git a/package/python3/Config.in b/package/python3/Config.in index 0c5018f0b3..7e19f84843 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -41,6 +41,12 @@ menu "core python3 modules" comment "The following modules are unusual or require extra libraries" +config BR2_PACKAGE_PYTHON3_BERKELEYDB + bool "berkeleydb" + select BR2_PACKAGE_BERKELEYDB + help + berkeleydb module for Python3 + config BR2_PACKAGE_PYTHON3_BZIP2 bool "bz2 module" select BR2_PACKAGE_BZIP2 diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 2656037efd..b0aa239250 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -49,6 +49,12 @@ endif PYTHON3_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PYTHON3_BERKELEYDB),y) +PYTHON3_DEPENDENCIES += berkeleydb +else +PYTHON3_CONF_OPTS += --disable-berkeleydb +endif + ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) PYTHON3_DEPENDENCIES += readline else