Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C5D8C9485 for ; Sun, 20 Nov 2011 22:24:23 +0000 (UTC) Received: (qmail 16503 invoked by uid 500); 20 Nov 2011 22:24:23 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 16475 invoked by uid 500); 20 Nov 2011 22:24:23 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 16468 invoked by uid 99); 20 Nov 2011 22:24:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Nov 2011 22:24:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Nov 2011 22:24:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BB3CB238890A; Sun, 20 Nov 2011 22:23:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1204286 - in /incubator/ooo/trunk/main/python: Python-disable-dbm.patch makefile.mk Date: Sun, 20 Nov 2011 22:23:59 -0000 To: ooo-commits@incubator.apache.org From: arielch@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111120222359.BB3CB238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arielch Date: Sun Nov 20 22:23:59 2011 New Revision: 1204286 URL: http://svn.apache.org/viewvc?rev=1204286&view=rev Log: i118621 - python: build breaks due to undefined symbol: dbm_nextkey in dbm.so module Added: incubator/ooo/trunk/main/python/Python-disable-dbm.patch (with props) Modified: incubator/ooo/trunk/main/python/makefile.mk Added: incubator/ooo/trunk/main/python/Python-disable-dbm.patch URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/Python-disable-dbm.patch?rev=1204286&view=auto ============================================================================== --- incubator/ooo/trunk/main/python/Python-disable-dbm.patch (added) +++ incubator/ooo/trunk/main/python/Python-disable-dbm.patch Sun Nov 20 22:23:59 2011 @@ -0,0 +1,36 @@ +diff -uNrp misc/build/Python-2.6.1/setup.py misc/Python-2.6.1/setup.py +--- misc/build/Python-2.6.1/setup.py 2008-11-04 18:43:31.000000000 -0200 ++++ misc/Python-2.6.1/setup.py 2011-11-20 18:50:21.871389472 -0300 +@@ -1008,32 +1008,6 @@ class PyBuildExt(build_ext): + else: + missing.append('bsddb185') + +- # The standard Unix dbm module: +- if platform not in ['cygwin']: +- if find_file("ndbm.h", inc_dirs, []) is not None: +- # Some systems have -lndbm, others don't +- if self.compiler.find_library_file(lib_dirs, 'ndbm'): +- ndbm_libs = ['ndbm'] +- else: +- ndbm_libs = [] +- exts.append( Extension('dbm', ['dbmmodule.c'], +- define_macros=[('HAVE_NDBM_H',None)], +- libraries = ndbm_libs ) ) +- elif (self.compiler.find_library_file(lib_dirs, 'gdbm') +- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): +- exts.append( Extension('dbm', ['dbmmodule.c'], +- define_macros=[('HAVE_GDBM_NDBM_H',None)], +- libraries = ['gdbm'] ) ) +- elif db_incs is not None: +- exts.append( Extension('dbm', ['dbmmodule.c'], +- library_dirs=dblib_dir, +- runtime_library_dirs=dblib_dir, +- include_dirs=db_incs, +- define_macros=[('HAVE_BERKDB_H',None), +- ('DB_DBM_HSEARCH',None)], +- libraries=dblibs)) +- else: +- missing.append('dbm') + + # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: + if (self.compiler.find_library_file(lib_dirs, 'gdbm')): Propchange: incubator/ooo/trunk/main/python/Python-disable-dbm.patch ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/ooo/trunk/main/python/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/makefile.mk?rev=1204286&r1=1204285&r2=1204286&view=diff ============================================================================== --- incubator/ooo/trunk/main/python/makefile.mk (original) +++ incubator/ooo/trunk/main/python/makefile.mk Sun Nov 20 22:23:59 2011 @@ -52,7 +52,8 @@ PATCH_FILES=\ Python-parallel-make.patch \ Python-ssl.patch \ Python-2.6.1-sysbase.patch\ - Python-2.6.1-nohardlink.patch + Python-2.6.1-nohardlink.patch \ + Python-disable-dbm.patch CONFIGURE_DIR=