packages: python/python.spec, python/python-verbose.patch (NEW) - use syste...

[arekm]

Author: arekm                        Date: Wed Jul  7 19:30:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system ffi; verbose modules build; fix tests

---- Files affected:
packages/python:
   python.spec (1.365 -> 1.366) , python-verbose.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python/python.spec
diff -u packages/python/python.spec:1.365 packages/python/python.spec:1.366
--- packages/python/python.spec:1.365	Tue Jul  6 09:08:17 2010
+++ packages/python/python.spec	Wed Jul  7 21:30:44 2010
@@ -57,6 +57,7 @@
 Patch2:		%{name}-ac_fixes.patch
 Patch3:		%{name}-lib64.patch
 Patch4:		%{name}-noarch_to_datadir.patch
+Patch5:		%{name}-verbose.patch
 URL:		http://www.python.org/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	bluez-libs-devel
@@ -549,6 +550,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 tar xjf %{SOURCE1}
 
@@ -565,6 +567,7 @@
 	--enable-ipv6 \
 	--enable-unicode=ucs4 \
 	--enable-shared \
+	--with-system-ffi \
 	--with-dbmliborder=gdbm:bdb \
 	LINKCC='$(PURIFY) $(CXX)' \
 	LDSHARED='$(CC) $(CFLAGS) -shared' \
@@ -589,7 +592,7 @@
 binlibdir="`pwd`/`echo build/lib.*`"
 %{__make} -j1 test \
 	TESTOPTS="%{test_flags} %{test_list}" \
-	TESTPYTHON="LD_LIBRARY_PATH=`pwd` PYTHONHOME=`pwd` PYTHONPATH=`pwd`/Lib:$binlibdir ./python -tt"
+	TESTPYTHON="LD_LIBRARY_PATH=`pwd` PYTHONHOME=`pwd` PYTHONPATH=`pwd`/Lib:`pwd`/Lib/lib-tk:$binlibdir ./python -tt"
 %endif
 
 %install
@@ -1021,6 +1024,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.366  2010/07/07 19:30:44  arekm
+- use system ffi; verbose modules build; fix tests
+
 Revision 1.365  2010/07/06 07:08:17  arekm
 - audioop is supposed to work fine on 64bit arches now
 

================================================================
Index: packages/python/python-verbose.patch
diff -u /dev/null packages/python/python-verbose.patch:1.1
--- /dev/null	Wed Jul  7 21:30:50 2010
+++ packages/python/python-verbose.patch	Wed Jul  7 21:30:44 2010
@@ -0,0 +1,13 @@
+--- Python-2.7/Makefile.pre.in~	2010-07-07 20:08:20.064007110 +0200
++++ Python-2.7/Makefile.pre.in	2010-07-07 20:57:44.012878634 +0200
+@@ -406,8 +406,8 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ 	@case $$MAKEFLAGS in \
+-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -vvv build;; \
++	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -vvv build;; \
+ 	esac
+ 
+ # Build static library
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python.spec?r1=1.365&r2=1.366&f=u