[PyQt] Specifying Include Directories for PyQt Build

[Scott Kitterman]

On Saturday, October 20, 2012 10:42:07 PM Scott Kitterman wrote:
> On Saturday, October 20, 2012 08:44:25 PM Scott Kitterman wrote:
> > Starting with python3.3, python will support multiarch [1] in Debian and
> > Ubuntu.  As part of this change, the path for some of the Python header
> > files has changed, so I need to specify multiple include directories.
> > Here's an example using pkg-config so show the difference between
> > python3.2
> > and python3.3 on an i386 system:
> > 
> > $ pkg-config --cflags-only-I python-3.2mu
> > -I/usr/include/python3.2mu
> > 
> > $ pkg-config --cflags-only-I python-3.3m
> > -I/usr/include/python3.3m -I/usr/include/i386-linux-gnu/python3.3m
> > 
> > So how do I specify both directories for building with this multi-arch'ed
> > python3.3?  Any advice appreciated.
> > 
> > Scott K
> > 
> > [1] http://wiki.debian.org/Multiarch
> 
> Nevermind.  I think I understand the problem now.

I had it half solved.  Once I fixed my sip4 build, the arch specific directory 
was captured by sip in py_conf_inc_dir and I had correct includes for the 
directories configured by sip, but not for qpy.  Adding the patch below to 
configure.py solved that by adding it to the qpy .pro files.  Is this a 
reasonable way to handle it and would you consider this an appropriate change 
for upstream?

Scott K

Index: python-qt4-4.9.3/configure.py
===================================================================
--- python-qt4-4.9.3.orig/configure.py  2012-10-21 04:38:26.000000000 +0000
+++ python-qt4-4.9.3/configure.py       2012-10-21 04:40:50.912484733 +0000
@@ -811,6 +811,9 @@
                 if sipcfg.sip_inc_dir != sipcfg.py_inc_dir:
                     inc_path.insert(0, sipcfg.sip_inc_dir)

+                if sipcfg.py_inc_dir != sipcfg.py_conf_inc_dir:
+                   inc_path.insert(0, sipcfg.py_conf_inc_dir)
+
                 if opts.bigqt:
                     api_dir = "../../_qt"
                 else