diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 20:58:18 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:49 +0000 |
| commit | d04ac66578b41345305d620d3eaf6ca7ee83c6c3 (patch) | |
| tree | dea2f895971e97352c7c609b5d571e3f3f05a426 /python | |
| parent | f78a2bcce88dd5c12052ae3e55c561cdd48b05fe (diff) | |
dung out berkeleydb gnumake / configure bits ...
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-cross.berkeleydb.patch | 15 | ||||
| -rw-r--r-- | python/makefile.mk | 6 | ||||
| -rw-r--r-- | python/prj/build.lst | 2 |
3 files changed, 1 insertions, 22 deletions
diff --git a/python/Python-2.6.1-cross.berkeleydb.patch b/python/Python-2.6.1-cross.berkeleydb.patch deleted file mode 100644 index e6783f6e10c9..000000000000 --- a/python/Python-2.6.1-cross.berkeleydb.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- misc/build/Python-2.6.1/Modules/Setup.dist (revision 74955) -+++ misc/build/Python-2.6.1/Modules/Setup.dist (working copy) -@@ -413,9 +413,9 @@ - # and the subdirectory of PORT where you built it. - DB=$(prefix) - DBLIBVER=4.8 --DBINC=$(DB)/include --DBLIB=$(DB)/lib --_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) -+DBINC=$(OUTDIR)/inc/berkeleydb -+DBLIB=$(OUTDIR)/lib -+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb47 - - # Historical Berkeley DB 1.85 - # diff --git a/python/makefile.mk b/python/makefile.mk index 9ea78ef1e16a..87014cacd742 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -129,12 +129,6 @@ PATCH_FILES= \ Python-2.6.2-cross.patch \ Python-2.6.2-cross.fix-configure.patch \ -.IF "$(SYSTEM_DB)" != "YES" -PATCH_FILES += \ - Python-2.6.1-cross.berkeleydb.patch \ - -.ENDIF - BUILD_DIR= MYCWD=$(shell @pwd)/$(INPATH)/misc/build .IF "$(PYTHON_FOR_BUILD)" == "" diff --git a/python/prj/build.lst b/python/prj/build.lst index c83e39ac737f..9f2619f64489 100644 --- a/python/prj/build.lst +++ b/python/prj/build.lst @@ -1,3 +1,3 @@ -py python : BERKELEYDB:berkeleydb solenv OPENSSL:openssl NULL +py python: solenv OPENSSL:openssl NULL py python nmake - w,vc7 py_mkout NULL py python nmake - u py_mkout NULL |