[PyQt] Can't configure sip 4.16-snapshot-f6acb8ed7b65 for win32-g++

[Arve Knudsen]

There's a bug. In version 4.16, build macros are parsed before
build_platform is applied from the commandline (i.e., --platform). The
below patch fixes this regression (I've verified that this revision works).

--- .\configure.py.old 2014-05-19 11:54:44.374585800 +0200
+++ .\configure.py 2014-05-19 11:47:28.462595600 +0200
@@ -779,15 +779,6 @@
     else:
         opts.universal = ''

-    # Get the platform specific macros for building.
-    macros = siputils.parse_build_macros(
-            os.path.join(src_dir, "specs", build_platform),
build_macro_names,
-            args)
-
-    if macros is None:
-        siputils.error("Unsupported macro name specified. Use the
--show-build-macros flag to see a list of supported macros.")
-        sys.exit(2)
-
     # Apply the overrides from any configuration file.
     global plat_bin_dir, plat_py_conf_inc_dir, plat_py_inc_dir
     global plat_py_lib_dir, plat_py_site_dir, plat_sip_dir
@@ -836,6 +827,15 @@
     if opts.sipsipdir is not None:
         sip_sip_dir = opts.sipsipdir

+    # Get the platform specific macros for building.
+    macros = siputils.parse_build_macros(
+            os.path.join(src_dir, "specs", build_platform),
build_macro_names,
+            args)
+
+    if macros is None:
+        siputils.error("Unsupported macro name specified. Use the
--show-build-macros flag to see a list of supported macros.")
+        sys.exit(2)
+
     # Fix the name of the sip module.
     global sip_module_base


Arve


On Mon, May 19, 2014 at 10:23 AM, Arve Knudsen <arve.knudsen at gmail.com>wrote:

> On Mon, May 19, 2014 at 9:50 AM, Phil Thompson <
> phil at riverbankcomputing.com> wrote:
>
>> On 19/05/2014 8:36 am, Arve Knudsen wrote:
>>
>>> Hi
>>>
>>> I'm trying to install sip 4.16-snapshot-f6acb8ed7b65, but the
>>> configuration phase emits Makefiles for MSVC even though I specify
>>> win32-g++ as the platform:
>>>
>>>      python .configure.py -p win32-g++
>>>
>>> For example, sipgenMakefile starts with the following definitions:
>>>
>>>
>>>     TARGET = sip.exe
>>>     OFILES = main.obj transform.obj gencode.obj extracts.obj
>>> export.obj heap.obj parser.obj lexer.obj
>>>     HFILES = sip.h parser.h
>>>
>>>     CC = cl
>>>     CXX = cl
>>>
>>> As you can see, the compilers (CC/CXX) are MSVC.
>>>
>>
>> Works fine for me.
>>
>
> But what am I doing wrong then? All I do is the following:
>
>     cd .\sip-4.16-snapshot-f6acb8ed7b65
>     python .\configure.py -p win32-g++
>
> My Python version is 3.4.0. The exact same procedure with sip 4.15
> produces Makefiles for MinGW.
>
> Arve
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.riverbankcomputing.com/pipermail/pyqt/attachments/20140519/b521de31/attachment.html>