diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-17 17:02:59 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-17 17:02:59 +0000 |
| commit | 1677e26dfe2cfe996ccfaa654ba2710e636e5c36 (patch) | |
| tree | 0d6a5acf08e0993f99f19378448ba3aab427e11c /java/jamvm/files | |
| parent | 585bd71a3558aff0d4e81829cb8cbe2a7841f5b6 (diff) | |
Notes
Diffstat (limited to 'java/jamvm/files')
| -rw-r--r-- | java/jamvm/files/patch-configure | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/java/jamvm/files/patch-configure b/java/jamvm/files/patch-configure index cb5f5ad70a91..6944165c6628 100644 --- a/java/jamvm/files/patch-configure +++ b/java/jamvm/files/patch-configure @@ -1,5 +1,5 @@ --- configure.orig 2009-12-31 13:41:44.000000000 -0500 -+++ configure 2012-09-12 20:07:36.000000000 -0400 ++++ configure 2012-09-17 12:29:34.000000000 -0400 @@ -2689,7 +2689,7 @@ hppa*-*-linux*) host_cpu=parisc host_os=linux ;; mipsel-*-linux*) host_cpu=mips host_os=linux ;; @@ -9,3 +9,42 @@ arm*-*-linux*) host_cpu=arm host_os=linux ;; arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; +@@ -21662,8 +21662,15 @@ + if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then + $as_echo_n "(cached) " >&6 + else ++ ac_check_lib_save_CFLAGS=$CFLAGS ++ ac_check_lib_save_LDFLAGS=$LDFLAGS + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lffi $LIBS" ++ LIBFFI_CFLAGS="$($PKG_CONFIG libffi --cflags)" ++ LIBFFI_LDFLAGS="$($PKG_CONFIG libffi --libs-only-L)" ++ LIBFFI_LIBS="$($PKG_CONFIG libffi --libs-only-l)" ++CFLAGS="$LIBFFI_CFLAGS $CFLAGS" ++LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" ++LIBS="$LIBFFI_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21718,6 +21725,8 @@ + rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext ++CFLAGS=$ac_check_lib_save_CFLAGS ++LDFLAGS=$ac_check_lib_save_LDFLAGS + LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5 +@@ -21726,9 +21735,9 @@ + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBFFI 1 + _ACEOF +- +- LIBS="-lffi $LIBS" +- ++ CFLAGS="$LIBFFI_CFLAGS $CFLAGS" ++ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS" ++ LIBS="$LIBFFI_LIBS $LIBS" + else + { { $as_echo "$as_me:$LINENO: error: libffi is missing" >&5 + $as_echo "$as_me: error: libffi is missing" >&2;} |