diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:23:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:57:20 +0100 |
| commit | 11e776023c89b3de690b37ffaed18ec996b9c207 (patch) | |
| tree | 9f7ed420f2adee8fb00bccf02dca4697f171bcee /python3 | |
| parent | ee352d11aa5911d510d691bd925cf877f2f16943 (diff) | |
python3: try to fix clang breakage in libffi
Thanks kendy for digging up the patch.
Change-Id: I97bc96081736596e84206b95a8d6b658ec3ffae5
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | python3/python-3.3.0-ffi-clang.patch.1 | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index fe1f3ff61099..5f30420bcde4 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ 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 \ + python3/python-3.3.0-ffi-clang.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/python3/python-3.3.0-ffi-clang.patch.1 b/python3/python-3.3.0-ffi-clang.patch.1 new file mode 100644 index 000000000000..0dcbc42d13a4 --- /dev/null +++ b/python3/python-3.3.0-ffi-clang.patch.1 @@ -0,0 +1,40 @@ +fix clang build problem: + +python3/Modules/_ctypes/libffi/src/x86/sysv.S:389:17: error: invalid variant ´rel´ +Patch by: Rafael Avila de Espindola <respindola at mozilla dot com> +https://417179.bugs.gentoo.org/attachment.cgi?id=313299 + +diff -ru python3.old/Modules/_ctypes/libffi/configure.ac python3/Modules/_ctypes/libffi/configure.ac +--- python3.old/Modules/_ctypes/libffi/configure.ac 2012-09-29 10:00:42.000000000 +0200 ++++ python3/Modules/_ctypes/libffi/configure.ac 2012-11-27 16:12:44.421564130 +0100 +@@ -303,10 +303,10 @@ + if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then + AC_CACHE_CHECK([assembler supports pc related relocs], + libffi_cv_as_x86_pcrel, [ +- libffi_cv_as_x86_pcrel=yes ++ libffi_cv_as_x86_pcrel=no + echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s +- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then +- libffi_cv_as_x86_pcrel=no ++ if $CC $CFLAGS -c conftest.s > /dev/null; then ++ libffi_cv_as_x86_pcrel=yes + fi + ]) + if test "x$libffi_cv_as_x86_pcrel" = xyes; then +diff -ru python3.old/Modules/_ctypes/libffi/configure python3/Modules/_ctypes/libffi/configure +--- python3.old/Modules/_ctypes/libffi/configure 2012-09-29 10:00:42.000000000 +0200 ++++ python3/Modules/_ctypes/libffi/configure 2012-11-27 16:12:44.420564130 +0100 +@@ -14322,10 +14322,10 @@ + $as_echo_n "(cached) " >&6 + else + +- libffi_cv_as_x86_pcrel=yes ++ libffi_cv_as_x86_pcrel=no + echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s +- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then +- libffi_cv_as_x86_pcrel=no ++ if $CC $CFLAGS -c conftest.s > /dev/null; then ++ libffi_cv_as_x86_pcrel=yes + fi + + fi |