|
Lines 1-16
Link Here
|
| 1 |
--- configure.orig 2009-12-31 13:41:44.000000000 -0500 |
1 |
--- ./configure.orig 2014-06-10 22:39:57.000000000 +0200 |
| 2 |
+++ configure 2012-09-17 12:29:34.000000000 -0400 |
2 |
+++ ./configure 2014-08-01 13:26:41.000000000 +0200 |
| 3 |
@@ -2689,7 +2689,7 @@ |
3 |
@@ -12882,8 +12882,16 @@ |
| 4 |
hppa*-*-linux*) host_cpu=parisc host_os=linux ;; |
4 |
if ${ac_cv_lib_ffi_ffi_call+:} false; then : |
| 5 |
mipsel-*-linux*) host_cpu=mips host_os=linux ;; |
|
|
| 6 |
x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;; |
| 7 |
-x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;; |
| 8 |
+amd64-*-freebsd*) host_os=bsd host_cpu=x86_64 libdl_needed=no ;; |
| 9 |
arm*-*-linux*) host_cpu=arm host_os=linux ;; |
| 10 |
arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; |
| 11 |
arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; |
| 12 |
@@ -21662,8 +21662,15 @@ |
| 13 |
if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then |
| 14 |
$as_echo_n "(cached) " >&6 |
5 |
$as_echo_n "(cached) " >&6 |
| 15 |
else |
6 |
else |
| 16 |
+ ac_check_lib_save_CFLAGS=$CFLAGS |
7 |
+ ac_check_lib_save_CFLAGS=$CFLAGS |
|
Lines 23-41
Link Here
|
| 23 |
+CFLAGS="$LIBFFI_CFLAGS $CFLAGS" |
14 |
+CFLAGS="$LIBFFI_CFLAGS $CFLAGS" |
| 24 |
+LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" |
15 |
+LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" |
| 25 |
+LIBS="$LIBFFI_LIBS $LIBS" |
16 |
+LIBS="$LIBFFI_LIBS $LIBS" |
| 26 |
cat >conftest.$ac_ext <<_ACEOF |
17 |
+ |
| 27 |
/* confdefs.h. */ |
18 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 28 |
_ACEOF |
19 |
/* end confdefs.h. */ |
| 29 |
@@ -21718,6 +21725,8 @@ |
20 |
|
| 30 |
rm -rf conftest.dSYM |
21 |
@@ -12917,9 +12925,9 @@ |
| 31 |
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
|
|
| 32 |
conftest$ac_exeext conftest.$ac_ext |
| 33 |
+CFLAGS=$ac_check_lib_save_CFLAGS |
| 34 |
+LDFLAGS=$ac_check_lib_save_LDFLAGS |
| 35 |
LIBS=$ac_check_lib_save_LIBS |
| 36 |
fi |
| 37 |
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5 |
| 38 |
@@ -21726,9 +21735,9 @@ |
| 39 |
cat >>confdefs.h <<_ACEOF |
22 |
cat >>confdefs.h <<_ACEOF |
| 40 |
#define HAVE_LIBFFI 1 |
23 |
#define HAVE_LIBFFI 1 |
| 41 |
_ACEOF |
24 |
_ACEOF |
|
Lines 46-50
Link Here
|
| 46 |
+ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" |
29 |
+ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" |
| 47 |
+ LIBS="$LIBFFI_LIBS $LIBS" |
30 |
+ LIBS="$LIBFFI_LIBS $LIBS" |
| 48 |
else |
31 |
else |
| 49 |
{ { $as_echo "$as_me:$LINENO: error: libffi is missing" >&5 |
32 |
as_fn_error $? "libffi is missing" "$LINENO" 5 |
| 50 |
$as_echo "$as_me: error: libffi is missing" >&2;} |
33 |
fi |