Attachment 297819 Details for Bug 436581 – Build python/xpcom extension

[patch] Build python/xpcom extension

xulrunner-pyxpcom.patch (text/plain), 2.72 KB, created by Marco Pesenti Gritti on 2008-03-12 18:05:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Pesenti Gritti

Created: 2008-03-12 18:05:23 UTC

Size: 2.72 KB

patch

obsolete

>--- mozilla/configure.in.orig	2008-03-12 14:29:44.000000000 +0100
>+++ mozilla/configure.in	2008-03-12 14:28:49.000000000 +0100
>@@ -7266,6 +7266,8 @@
>         dnl - Fixes to the above by Python/*nix knowledgable people welcome!
>         if test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>+        elif test -f "$MOZ_PYTHON_PREFIX/lib64/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>+            MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib64 -lpython$MOZ_PYTHON_VER_DOTTED"
>         elif test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>         elif test -f "$MOZ_PYTHON_PREFIX/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>--- mozilla/configure.orig	2008-03-12 13:46:05.000000000 +0100
>+++ mozilla/configure	2008-03-12 14:30:40.000000000 +0100
>@@ -20025,6 +20025,8 @@
>         MOZ_PYTHON_INCLUDES="-I$MOZ_PYTHON_PREFIX/include/python$MOZ_PYTHON_VER_DOTTED"
>                                                                                                 if test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>+        elif test -f "$MOZ_PYTHON_PREFIX/lib64/libpython$MOZ_PYTHON_VER_DOTTED.so.1.0"; then
>+            MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib64 -lpython$MOZ_PYTHON_VER_DOTTED"
>         elif test -f "$MOZ_PYTHON_PREFIX/lib/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>             MOZ_PYTHON_LIBS="-L$MOZ_PYTHON_PREFIX/lib -lpython$MOZ_PYTHON_VER_DOTTED"
>         elif test -f "$MOZ_PYTHON_PREFIX/libpython$MOZ_PYTHON_VER_DOTTED.so"; then
>@@ -20296,14 +20298,14 @@
> cross_compiling=$ac_cv_prog_cc_cross
> 
>     cat > conftest.$ac_ext <<EOF
>-#line 20300 "configure"
>+#line 20302 "configure"
> #include "confdefs.h"
> #include <gmodule.h>
> int main() {
>  int x = 1; x++; 
> ; return 0; }
> EOF
>-if { (eval echo configure:20307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+if { (eval echo configure:20309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>   :
> else
>   echo "configure: failed program was:" >&5
>@@ -20612,7 +20614,7 @@
>                 _SAVE_CFLAGS=$CFLAGS
>     CFLAGS="$CFLAGS $XCFLAGS"
>     cat > conftest.$ac_ext <<EOF
>-#line 20616 "configure"
>+#line 20618 "configure"
> #include "confdefs.h"
> 
>         #include <stdio.h>
>@@ -20629,7 +20631,7 @@
>     
> ; return 0; }
> EOF
>-if { (eval echo configure:20633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+if { (eval echo configure:20635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>   :
> else
>   echo "configure: failed program was:" >&5

Actions: View | Diff

Attachments on bug 436581: 297819 | 297875