Skip to content

Commit

Permalink
unix: remove support for building GDBM
Browse files Browse the repository at this point in the history
It is globally disabled as of the last release. We don't need to
keep the code around.
  • Loading branch information
indygreg committed Apr 8, 2023
1 parent 8351472 commit 0df7052
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 718 deletions.
674 changes: 0 additions & 674 deletions LICENSE.gdbm.txt

This file was deleted.

4 changes: 0 additions & 4 deletions cpython-unix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ $(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(
$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-expat.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) expat

$(OUTDIR)/gdbm-$(GDBM_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-gdbm.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) gdbm

$(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-inputproto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) inputproto

Expand Down Expand Up @@ -248,7 +245,6 @@ PYTHON_DEPENDS := \
$(if $(NEED_BDB),$(OUTDIR)/bdb-$(BDB_VERSION)-$(PACKAGE_SUFFIX).tar) \
$(if $(NEED_BZIP2),$(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar) \
$(if $(NEED_EXPAT),$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar) \
$(if $(NEED_GDBM),$(OUTDIR)/gdbm-$(GDBM_VERSION)-$(PACKAGE_SUFFIX).tar) \
$(if $(NEED_LIBEDIT),$(OUTDIR)/libedit-$(LIBEDIT_VERSION)-$(PACKAGE_SUFFIX).tar) \
$(if $(NEED_LIBFFI),$(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PACKAGE_SUFFIX).tar) \
$(if $(NEED_m4),$(OUTDIR)/m4-$(M4_VERSION)-$(PACKAGE_SUFFIX).tar) \
Expand Down
26 changes: 0 additions & 26 deletions cpython-unix/build-gdbm.sh

This file was deleted.

1 change: 0 additions & 1 deletion cpython-unix/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,6 @@ def main():
"bdb",
"bzip2",
"expat",
"gdbm",
"inputproto",
"kbproto",
"libffi",
Expand Down
2 changes: 0 additions & 2 deletions cpython-unix/targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,6 @@ i686-unknown-linux-gnu:
- bdb
- binutils
- bzip2
# TODO cross-compiling has issues.
# - gdbm
- expat
- libedit
- libffi
Expand Down
9 changes: 0 additions & 9 deletions pythonbuild/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,6 @@
"licenses": ["MIT"],
"license_file": "LICENSE.expat.txt",
},
"gdbm": {
"url": "https://ftp.gnu.org/gnu/gdbm/gdbm-1.21.tar.gz",
"size": 1005982,
"sha256": "b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2",
"version": "1.21",
"library_names": ["gdbm"],
"licenses": ["GPL-3.0-or-later"],
"license_file": "LICENSE.gdbm.txt",
},
"inputproto": {
"url": "https://www.x.org/archive/individual/proto/inputproto-2.3.2.tar.gz",
"size": 244334,
Expand Down
3 changes: 1 addition & 2 deletions pythonbuild/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ def target_needs(yaml_path: pathlib.Path, target: str, python_version: str):
needs = set(settings["needs"])

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

return needs
Expand Down

0 comments on commit 0df7052

Please sign in to comment.