[Python-apps-commits] r9295 - in packages/cython/trunk/debian (4 files)

[yoh at users.alioth.debian.org]

    Date: Thursday, December 6, 2012 @ 19:51:34
  Author: yoh
Revision: 9295

fix-ma-includes patch from Julian (+ refreshed 0001-fix-analysis... patch)

Added:
  packages/cython/trunk/debian/patches/fix-ma-includes.patch
Modified:
  packages/cython/trunk/debian/changelog
  packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
  packages/cython/trunk/debian/patches/series

Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog	2012-12-06 19:51:26 UTC (rev 9294)
+++ packages/cython/trunk/debian/changelog	2012-12-06 19:51:34 UTC (rev 9295)
@@ -7,6 +7,8 @@
     - 0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch
     - 0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
       (Closes: #692313)
+    - fix-ma-includes.patch from Julian Taylor to add platform specific
+      paths (e.g. introduced with multiarch in python3.3) (Closes: #693555)
   * Boost python-dev to Recommends from Suggests for most common usage
     scenarios (Closes: #545809).  Also list python3-dev instead
     of python-dev for cython3 package.

Modified: packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch	2012-12-06 19:51:26 UTC (rev 9294)
+++ packages/cython/trunk/debian/patches/0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch	2012-12-06 19:51:34 UTC (rev 9295)
@@ -12,11 +12,9 @@
  Cython/Compiler/Symtab.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py
-index 4631d73..6ed9479 100644
 --- a/Cython/Compiler/Symtab.py
 +++ b/Cython/Compiler/Symtab.py
-@@ -802,7 +802,7 @@ class Scope(object):
+@@ -801,7 +801,7 @@ class Scope(object):
  
          for entry in self.var_entries:
              if entry.type.is_pyobject:
@@ -25,6 +23,3 @@
                      py_attrs.append(entry)
              elif entry.type == PyrexTypes.c_py_buffer_type:
                  py_buffers.append(entry)
--- 
-1.8.0
-

Added: packages/cython/trunk/debian/patches/fix-ma-includes.patch
===================================================================
--- packages/cython/trunk/debian/patches/fix-ma-includes.patch	                        (rev 0)
+++ packages/cython/trunk/debian/patches/fix-ma-includes.patch	2012-12-06 19:51:34 UTC (rev 9295)
@@ -0,0 +1,22 @@
+Description: python3 puts some stuff into multiarch paths
+ an alternative would be to use $(PYTHON)-config --includes
+Author: Julian Taylor <jtaylor at ubuntu.com>
+--- a/Demos/embed/Makefile
++++ b/Demos/embed/Makefile
+@@ -3,6 +3,7 @@
+ PYVERSION=$(shell $(PYTHON) -c "import sys; print(sys.version[:3])")
+ 
+ INCDIR=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_python_inc())")
++PLATINCDIR=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_python_inc(plat_specific=True))")
+ LIBDIR1=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
+ LIBDIR2=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBPL'))")
+ PYLIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY')[3:-2])")
+@@ -17,7 +18,7 @@
+ 	$(LINKCC) -o $@ $^ -L$(LIBDIR1) -L$(LIBDIR2) -l$(PYLIB) $(LIBS) $(SYSLIBS) $(LINKFORSHARED)
+ 
+ embedded.o: embedded.c
+-	$(CC) -c $^ -I$(INCDIR)
++	$(CC) -c $^ -I$(INCDIR) -I$(PLATINCDIR)
+ 
+ CYTHON=../../cython.py
+ embedded.c: embedded.pyx

Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series	2012-12-06 19:51:26 UTC (rev 9294)
+++ packages/cython/trunk/debian/patches/series	2012-12-06 19:51:34 UTC (rev 9295)
@@ -3,3 +3,4 @@
 0005-fix-cimport-cython-in-string-code-fragments.patch
 0006-fix-refnanny-code-for-del-statement-inside-of-genera.patch
 0001-fix-analysis-of-entry-to-be-a-weakref-typo-introduce.patch
+fix-ma-includes.patch