[Parted-maintainers] Bug#697779: pyparted: Use 'python-config --includes' to correctly detect multiarch include paths

[Tim Gardner]

On 01/09/2013 10:20 AM, Colin Watson wrote:
> On Wed, Jan 09, 2013 at 09:12:57AM -0700, Tim Gardner wrote:
>> diff -Nru pyparted-3.6/debian/rules pyparted-3.6/debian/rules
>> --- pyparted-3.6/debian/rules	2013-01-07 04:26:13.000000000 -0700
>> +++ pyparted-3.6/debian/rules	2013-01-09 08:58:36.000000000 -0700
>> @@ -20,7 +20,7 @@
>>  override_dh_auto_build:  
>>  	for pyvers in ${PYTHONS}; do \
>>  		(cd build/py$$pyvers/; $(MAKE) PYTHON=python$$pyvers); \
>> -		(cd build/py$$pyvers-dbg/; $(MAKE) PYTHON=python$$pyvers-dbg PYTHON_INCLUDES=`python$$pyvers-dbg-config --include`); \
>> +		(cd build/py$$pyvers-dbg/; $(MAKE) PYTHON=python$$pyvers-dbg PYTHON_INCLUDES=`python-config --includes`); \
>>  	done
>>  
>>  override_dh_auto_install:
> 
> As discussed on IRC, this is wrong.  python$$pyvers-dbg-config is the
> correct script to use, not python-config, and it exists so this isn't
> the problem.  I believe the problem is that m4/python.m4 requires PYTHON
> to be a full path in order to do header detection properly, and so the
> PYTHON variable passed to configure needs to be a full path.
> 

How about the attached.

rtg
-- 
Tim Gardner tim.gardner at canonical.com
-------------- next part --------------
diff -Nru pyparted-3.6/debian/changelog pyparted-3.6/debian/changelog
--- pyparted-3.6/debian/changelog	2013-01-09 10:18:22.000000000 -0700
+++ pyparted-3.6/debian/changelog	2013-01-09 11:26:15.000000000 -0700
@@ -1,3 +1,12 @@
+pyparted (3.6-5ubuntu1) raring; urgency=low
+
+  * m4/python.m4 really wants the full path in the PYTHON
+    environment variable in order to correctly determine all
+    multiarch include paths.
+    Thanks to Colin Watson for the suggestion.
+
+ -- Tim Gardner <tim.gardner at canonical.com>  Wed, 09 Jan 2013 17:22:01 +0000
+
 pyparted (3.6-5) unstable; urgency=low
 
   * debian/patches/no-last-flag-check.patch:
diff -Nru pyparted-3.6/debian/rules pyparted-3.6/debian/rules
--- pyparted-3.6/debian/rules	2013-01-09 10:21:07.000000000 -0700
+++ pyparted-3.6/debian/rules	2013-01-09 11:19:46.000000000 -0700
@@ -12,15 +12,15 @@
 override_dh_auto_configure:
 	for pyvers in ${PYTHONS}; do \
 		mkdir -p build/py$$pyvers; cp -Rl `ls . | grep -v build | grep -v debian` build/py$$pyvers;\
-		(cd build/py$$pyvers; ./configure --prefix=/usr PYTHON=python$$pyvers PYTHON_INCLUDES="`python$$pyvers-config`"); \
+		(cd build/py$$pyvers; ./configure --prefix=/usr PYTHON=/usr/bin/python$$pyvers); \
 		mkdir -p build/py$$pyvers-dbg; cp -Rl `ls . | grep -v build | grep -v debian` build/py$$pyvers-dbg; \
-		(cd build/py$$pyvers-dbg; ./configure --prefix=/usr PYTHON=python$$pyvers-dbg CFLAGS="-g -ggdb " PYTHON_INCLUDES="`python$$pyvers-dbg-config`"); \
+		(cd build/py$$pyvers-dbg; ./configure --prefix=/usr PYTHON=/usr/bin/python$$pyvers-dbg CFLAGS="-g -ggdb"); \
 	done
 
 override_dh_auto_build:  
 	for pyvers in ${PYTHONS}; do \
-		(cd build/py$$pyvers/; $(MAKE) PYTHON=python$$pyvers); \
-		(cd build/py$$pyvers-dbg/; $(MAKE) PYTHON=python$$pyvers-dbg PYTHON_INCLUDES=`python$$pyvers-dbg-config --includes`); \
+		(cd build/py$$pyvers/; $(MAKE) PYTHON=/usr/bin/python$$pyvers); \
+		(cd build/py$$pyvers-dbg/; $(MAKE) PYTHON=/usr/bin/python$$pyvers-dbg); \
 	done
 
 override_dh_auto_install: