From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: [PATCH 5/5] gnu: remove python-fix-dbm.patch Date: Fri, 7 Mar 2014 03:47:35 +0100 Message-ID: <1394160455-32580-6-git-send-email-tipecaml@gmail.com> References: <1394160455-32580-1-git-send-email-tipecaml@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLkv7-0007l2-8B for guix-devel@gnu.org; Thu, 06 Mar 2014 21:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLkv0-00079O-AC for guix-devel@gnu.org; Thu, 06 Mar 2014 21:53:57 -0500 Received: from mail-we0-x22b.google.com ([2a00:1450:400c:c03::22b]:37826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLkv0-00079C-3T for guix-devel@gnu.org; Thu, 06 Mar 2014 21:53:50 -0500 Received: by mail-we0-f171.google.com with SMTP id t61so4257592wes.30 for ; Thu, 06 Mar 2014 18:53:49 -0800 (PST) In-Reply-To: <1394160455-32580-1-git-send-email-tipecaml@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/patches/python-fix-dbm.patch: remove file. It is not needed anymore, and is probably a left-over of a failed merge. * gnu-system.am: remove gnu/packages/patches/python-fix-dbm.patch --- gnu-system.am | 1 - gnu/packages/patches/python-fix-dbm.patch | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 gnu/packages/patches/python-fix-dbm.patch diff --git a/gnu-system.am b/gnu-system.am index 6ef6edf..2bd7656 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -306,7 +306,6 @@ dist_patch_DATA = \ gnu/packages/patches/procps-make-3.82.patch \ gnu/packages/patches/pulseaudio-test-timeouts.patch \ gnu/packages/patches/pulseaudio-volume-test.patch \ - gnu/packages/patches/python-fix-dbm.patch \ gnu/packages/patches/python-fix-tests.patch \ gnu/packages/patches/qemu-make-4.0.patch \ gnu/packages/patches/qemu-multiple-smb-shares.patch \ diff --git a/gnu/packages/patches/python-fix-dbm.patch b/gnu/packages/patches/python-fix-dbm.patch deleted file mode 100644 index 29e4521..0000000 --- a/gnu/packages/patches/python-fix-dbm.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch allows the dbm module to be built using the compatibility mode of -gdbm. It will not be needed any more with Python 2.7.4. ---- setup.py 2013-04-06 00:53:37.000000000 +0200 -+++ setup.py.new 2013-04-06 19:55:05.000000000 +0200 -@@ -1158,10 +1158,14 @@ - for cand in dbm_order: - if cand == "ndbm": - if find_file("ndbm.h", inc_dirs, []) is not None: -- # Some systems have -lndbm, others don't -+ # Some systems have -lndbm, some have -lgdbm_compat, -+ # others have no particular linker flags. - if self.compiler.find_library_file(lib_dirs, - 'ndbm'): - ndbm_libs = ['ndbm'] -+ elif self.compiler.find_library_file(lib_dirs, -+ 'gdbm_compat'): -+ ndbm_libs = ['gdbm_compat'] - else: - ndbm_libs = [] - print "building dbm using ndbm" -- 1.8.4.rc3