diff --git a/omnibus/config/patches/python/disable_modules.patch b/omnibus/config/patches/python/disable_modules.patch index f5b3afbf9..5271bc873 100644 --- a/omnibus/config/patches/python/disable_modules.patch +++ b/omnibus/config/patches/python/disable_modules.patch @@ -2,22 +2,13 @@ diff --git a/Setup b/Setup.new index 02cfb67..26342ef 100644 --- a/Setup +++ b/Setup.new -@@ -325,7 +325,7 @@ _symtable symtablemodule.c - - # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: - --#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm -+_gdbm _gdbmmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lgdbm - - - # Helper module for various ascii-encoders @@ -366,7 +366,8 @@ xxsubtype xxsubtype.c # Uncommenting the following line tells makesetup that all following modules # are not built (see above for more detail). # -#*disabled* +*disabled* -+nis _sqlite3 ++nis _sqlite3 _gdbm _dbm # #_sqlite3 _tkinter _curses pyexpat #_codecs_jp _codecs_kr _codecs_tw unicodedata diff --git a/omnibus/config/software/gdbm.rb b/omnibus/config/software/gdbm.rb deleted file mode 100644 index 874c33b58..000000000 --- a/omnibus/config/software/gdbm.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -# Copyright 2021 Firezone -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -name "gdbm" -default_version "1.21" - -version("1.21") { source sha256: "b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2" } - -source url: "https://mirrors.kernel.org/gnu/gdbm/gdbm-#{version}.tar.gz" - -relative_path "gdbm-#{version}" - -build do - env = with_standard_compiler_flags(with_embedded_path) - - configure_command = %W( - ./configure - --prefix=#{install_dir}/embedded - ) - - command configure_command.join(" "), env: env - make "-j #{workers}", env: env - make "-j #{workers} install", env: env -end diff --git a/omnibus/config/software/python.rb b/omnibus/config/software/python.rb index 3766b4246..5702ae1cb 100644 --- a/omnibus/config/software/python.rb +++ b/omnibus/config/software/python.rb @@ -33,7 +33,6 @@ dependency "zlib" dependency "openssl" dependency "ncurses" dependency "libffi" -dependency "gdbm" relative_path "Python-#{version}"