diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:23:12 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:57:20 +0100 |
| commit | ee352d11aa5911d510d691bd925cf877f2f16943 (patch) | |
| tree | e70ad6617100d9458ac4ac4acb1e6fd92f554408 /python3 | |
| parent | ca3590466c57c2613be785c5c0b8b75bdb9a535c (diff) | |
python3: fix MSVC "implicit int" build breaker on tinderbox
Thanks to shm_get for guessing the cause of the problem.
Change-Id: Ieca7199c0c267dc2acaa9ece3ef55747e6a4f816
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | python3/python-3.3.0-implicit-int.patch.1 | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index d43ad8475400..fe1f3ff61099 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-msvc-disable.patch.1 \ python3/python-3.3.0-msvc-x64.patch.1 \ python3/python-3.3.0-ssl.patch.1 \ + python3/python-3.3.0-implicit-int.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/python3/python-3.3.0-implicit-int.patch.1 b/python3/python-3.3.0-implicit-int.patch.1 new file mode 100644 index 000000000000..6e4d2b05127d --- /dev/null +++ b/python3/python-3.3.0-implicit-int.patch.1 @@ -0,0 +1,30 @@ +fix function names in import.h + +MSVC complains about some declarations in Include/import.h. +Apparently the problem is a missing space between PyAPI_FUNC(int) and the +function name, leading to concatenated int_PyImport... names and no +return type. + +diff -ru python3.old/Include/import.h python3/Include/import.h +--- python3.old/Include/import.h 2012-09-29 10:00:26.000000000 +0200 ++++ python3/Include/import.h 2012-11-27 16:09:26.449390966 +0100 +@@ -86,15 +86,15 @@ + + PyAPI_FUNC(void) _PyImport_ReInitLock(void); + +-PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin( ++PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin( + const char *name /* UTF-8 encoded string */ + ); +-PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *); +-PyAPI_FUNC(int)_PyImport_FixupBuiltin( ++PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *); ++PyAPI_FUNC(int) _PyImport_FixupBuiltin( + PyObject *mod, + char *name /* UTF-8 encoded string */ + ); +-PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); ++PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); + + struct _inittab { + char *name; /* ASCII encoded string */ |