Skip to content

Commit 62a1f29

Browse files
committed
linux: build against Berkeley DB instead of GDBM
GDBM is GPLv3 licensed. Let's build against bdb so we have more favorable distribution terms.
1 parent 8c5a5f5 commit 62a1f29

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cpython-linux/build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,9 @@ def build_cpython(client, image, platform):
548548

549549
with run_container(client, image) as container:
550550
copy_toolchain(container, platform=platform)
551+
# TODO support bdb/gdbm toggle
552+
install_tools_archive(container, BUILD / ('bdb-%s.tar' % platform))
551553
install_tools_archive(container, BUILD / ('bzip2-%s.tar' % platform))
552-
# TODO build against Berkeley DB to avoid GPLv3.
553-
install_tools_archive(container, BUILD / ('gdbm-%s.tar' % platform))
554554
# TODO support libedit/libreadline toggle
555555
install_tools_archive(container, BUILD / ('libedit-%s.tar' % platform))
556556
install_tools_archive(container, BUILD / ('libffi-%s.tar' % platform))

cpython-linux/static-modules

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ _curses_panel _curses_panel.c -I/tools/deps/include/ncurses -L/tools/deps/lib -l
1010
_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c -I/tools/deps/lib/libffi-3.2.1/include -lffi -ldl
1111
_ctypes_test _ctypes/_ctypes_test.c -I/tools/deps/lib/libffi-3.2.1/include -lm
1212
_decimal _decimal/_decimal.c _decimal/libmpdec/basearith.c _decimal/libmpdec/constants.c _decimal/libmpdec/context.c _decimal/libmpdec/convolute.c _decimal/libmpdec/crt.c _decimal/libmpdec/difradix2.c _decimal/libmpdec/fnt.c _decimal/libmpdec/fourstep.c _decimal/libmpdec/io.c _decimal/libmpdec/memory.c _decimal/libmpdec/mpdecimal.c _decimal/libmpdec/numbertheory.c _decimal/libmpdec/sixstep.c _decimal/libmpdec/transpose.c -DCONFIG_64=1 -DASM=1 -IModules/_decimal/libmpdec
13-
_dbm _dbmmodule.c -DHAVE_NDBM_H -I/tools/deps/include -L/tools/deps/lib -lgdbm_compat
13+
_dbm _dbmmodule.c -DHAVE_BERKDB_H -DDB_DBM_HSEARCH -I/tools/deps/include -L/tools/deps/lib -ldb
1414
_elementtree _elementtree.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
15-
_gdbm _gdbmmodule.c -DHAVE_NDBM_H -I/tools/deps/include -L/tools/deps/lib -lgdbm
15+
# Cannot build _gdbm due to use of bdb.
16+
#_gdbm _gdbmmodule.c -DHAVE_NDBM_H -I/tools/deps/include -L/tools/deps/lib -lgdbm
1617
_hashlib _hashopenssl.c -I/tools/deps/include -L/tools/deps/lib -lssl -lcrypto
1718
_json _json.c
1819
_lsprof _lsprof.c rotatingtree.c

0 commit comments

Comments
 (0)