Skip to content

Commit 0df7052

Browse files
committed
unix: remove support for building GDBM
It is globally disabled as of the last release. We don't need to keep the code around.
1 parent 8351472 commit 0df7052

File tree

7 files changed

+1
-718
lines changed

7 files changed

+1
-718
lines changed

LICENSE.gdbm.txt

Lines changed: 0 additions & 674 deletions
This file was deleted.

cpython-unix/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ $(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(
111111
$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-expat.sh
112112
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) expat
113113

114-
$(OUTDIR)/gdbm-$(GDBM_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-gdbm.sh
115-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) gdbm
116-
117114
$(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-inputproto.sh
118115
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) inputproto
119116

@@ -248,7 +245,6 @@ PYTHON_DEPENDS := \
248245
$(if $(NEED_BDB),$(OUTDIR)/bdb-$(BDB_VERSION)-$(PACKAGE_SUFFIX).tar) \
249246
$(if $(NEED_BZIP2),$(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar) \
250247
$(if $(NEED_EXPAT),$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar) \
251-
$(if $(NEED_GDBM),$(OUTDIR)/gdbm-$(GDBM_VERSION)-$(PACKAGE_SUFFIX).tar) \
252248
$(if $(NEED_LIBEDIT),$(OUTDIR)/libedit-$(LIBEDIT_VERSION)-$(PACKAGE_SUFFIX).tar) \
253249
$(if $(NEED_LIBFFI),$(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PACKAGE_SUFFIX).tar) \
254250
$(if $(NEED_m4),$(OUTDIR)/m4-$(M4_VERSION)-$(PACKAGE_SUFFIX).tar) \

cpython-unix/build-gdbm.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

cpython-unix/build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,6 @@ def main():
936936
"bdb",
937937
"bzip2",
938938
"expat",
939-
"gdbm",
940939
"inputproto",
941940
"kbproto",
942941
"libffi",

cpython-unix/targets.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,6 @@ i686-unknown-linux-gnu:
314314
- bdb
315315
- binutils
316316
- bzip2
317-
# TODO cross-compiling has issues.
318-
# - gdbm
319317
- expat
320318
- libedit
321319
- libffi

pythonbuild/downloads.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@
7979
"licenses": ["MIT"],
8080
"license_file": "LICENSE.expat.txt",
8181
},
82-
"gdbm": {
83-
"url": "https://ftp.gnu.org/gnu/gdbm/gdbm-1.21.tar.gz",
84-
"size": 1005982,
85-
"sha256": "b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2",
86-
"version": "1.21",
87-
"library_names": ["gdbm"],
88-
"licenses": ["GPL-3.0-or-later"],
89-
"license_file": "LICENSE.gdbm.txt",
90-
},
9182
"inputproto": {
9283
"url": "https://www.x.org/archive/individual/proto/inputproto-2.3.2.tar.gz",
9384
"size": 244334,

pythonbuild/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ def target_needs(yaml_path: pathlib.Path, target: str, python_version: str):
5959
needs = set(settings["needs"])
6060

6161
# We only ship libedit linked readline extension on 3.10+ to avoid a GPL
62-
# dependency. Ditto for gdbm.
62+
# dependency.
6363
if not python_version.startswith(("3.8", "3.9")):
64-
needs.discard("gdbm")
6564
needs.discard("readline")
6665

6766
return needs

0 commit comments

Comments
 (0)