diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:28:42 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:40:45 -0600 |
commit | 9dc3f0f5af0fe64ced5d1aca2fc1ddf28c3974c9 (patch) | |
tree | 9dd3583b360f02747470d68b4f4de644ab73a4d4 /external/python3/python-3.3.0-ffi-clang.patch.1 | |
parent | 45053900a4b05018359bfc135ebe0b2c6ab93f4f (diff) |
fdo#70393: move python3 to a subdir of external
Change-Id: Ic5796f096255d2d84e39415324e8a2e06bcf09c9
Reviewed-on: https://gerrit.libreoffice.org/6550
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/python3/python-3.3.0-ffi-clang.patch.1')
-rw-r--r-- | external/python3/python-3.3.0-ffi-clang.patch.1 | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/external/python3/python-3.3.0-ffi-clang.patch.1 b/external/python3/python-3.3.0-ffi-clang.patch.1 new file mode 100644 index 000000000000..0dcbc42d13a4 --- /dev/null +++ b/external/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 |