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

[yoh at users.alioth.debian.org]

    Date: Friday, February 18, 2011 @ 04:07:12
  Author: yoh
Revision: 6667

adopting patch from upstream: fix makefile for embed testcase

Added:
  packages/cython/trunk/debian/patches/
  packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch
  packages/cython/trunk/debian/patches/series
Modified:
  packages/cython/trunk/debian/changelog

Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog	2011-02-18 04:06:55 UTC (rev 6666)
+++ packages/cython/trunk/debian/changelog	2011-02-18 04:07:12 UTC (rev 6667)
@@ -1,6 +1,8 @@
 cython (0.14.1-2) unstable; urgency=low
 
   * Run unittests against default Python version during build
+    - Adopted 0001-fix-makefile-for-embed-testcase.patch from upstream
+      for embedded test to perform correctly
   * Added numpy and profiler into Build-Depends to facilitate all tests above
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Tue, 15 Feb 2011 13:35:52 -0500

Added: packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch
===================================================================
--- packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch	                        (rev 0)
+++ packages/cython/trunk/debian/patches/0001-fix-makefile-for-embed-testcase.patch	2011-02-18 04:07:12 UTC (rev 6667)
@@ -0,0 +1,36 @@
+From: Lisandro Dalcin <dalcinl at gmail.com>
+Date: Wed, 16 Feb 2011 18:55:06 -0300
+Vendor: upstream
+Subject: [PATCH] fix makefile for embed testcase
+
+Adopted from GIT repository to fix unittesting of 0.14.1
+
+---
+ Demos/embed/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Demos/embed/Makefile b/Demos/embed/Makefile
+index b43d08a..1112589 100644
+--- a/Demos/embed/Makefile
++++ b/Demos/embed/Makefile
+@@ -5,7 +5,7 @@ PYVERSION=$(shell $(PYTHON) -c "import sys; print(sys.version[:3])")
+ INCDIR=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_python_inc())")
+ 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'))")
+-STATIC_PYLIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY'))")
++PYLIB=$(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY')[3:-2])")
+ 
+ CC=$(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('CC'))")
+ LINKCC=$(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LINKCC'))")
+@@ -14,7 +14,7 @@ LIBS=$(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig
+ SYSLIBS= $(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SYSLIBS'))")
+ 
+ embedded: embedded.o
+-	$(LINKCC) -o $@ $^ $(LIBDIR1)/$(STATIC_PYLIB) $(LINKFORSHARED) -L$(LIBDIR1) -L$(LIBDIR2) $(LIBS) $(SYSLIBS)
++	$(LINKCC) -o $@ $^ -L$(LIBDIR1) -L$(LIBDIR2) -l$(PYLIB) $(LIBS) $(SYSLIBS) $(LINKFORSHARED)
+ 
+ embedded.o: embedded.c
+ 	$(CC) -c $^ -I$(INCDIR)
+-- 
+1.7.2.3
+

Added: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series	                        (rev 0)
+++ packages/cython/trunk/debian/patches/series	2011-02-18 04:07:12 UTC (rev 6667)
@@ -0,0 +1 @@
+0001-fix-makefile-for-embed-testcase.patch