From 74770df7e31271be5056ab757cc3d5875ef002e8 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 10 Jan 2013 19:42:26 +0100 Subject: jamvm-initial: rename patches directory for newer bitbake --- recipes-core/jamvm/jamvm-initial/libffi.patch | 68 --------------------------- 1 file changed, 68 deletions(-) delete mode 100644 recipes-core/jamvm/jamvm-initial/libffi.patch (limited to 'recipes-core/jamvm/jamvm-initial/libffi.patch') diff --git a/recipes-core/jamvm/jamvm-initial/libffi.patch b/recipes-core/jamvm/jamvm-initial/libffi.patch deleted file mode 100644 index 216f03c..0000000 --- a/recipes-core/jamvm/jamvm-initial/libffi.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: jamvm-1.4.5/configure.ac -=================================================================== ---- jamvm-1.4.5.orig/configure.ac 2007-02-05 04:18:05.000000000 +0100 -+++ jamvm-1.4.5/configure.ac 2011-11-25 19:34:58.473683844 +0100 -@@ -166,10 +166,25 @@ - enable_zip=no - fi]) - --AC_CHECK_LIB(ffi,ffi_call,, -- [if test "$enable_ffi" != no; then -- AC_MSG_ERROR(cannot find libffi) -- fi]) -+LIBFFI_FOUND=no -+if test "$enable_ffi" = yes -+then -+PKG_CHECK_MODULES([LIBFFI], [libffi], [LIBFFI_FOUND=yes], [LIBFFI_FOUND=no]) -+if test "x${LIBFFI_FOUND}" = xno -+then -+ LIBFFI_FOUND= -+ AC_CHECK_HEADER([ffi.h],[LIBFFI_CFLAGS=],[LIBFFI_FOUND=no]) -+ AC_SEARCH_LIBS([ffi_call], [ffi],[LIBFFI_LIBS=-lffi],[LIBFFI_FOUND=no]) -+ if test "x${LIBFFI_FOUND}" = xno -+ then -+ AC_MSG_ERROR([Could not find libffi headers - \ -+ Instal libffi-devel or libffi-dev.]) -+ fi -+fi -+fi -+AC_SUBST(LIBFFI_CFLAGS) -+AC_SUBST(LIBFFI_LIBS) -+ - - dnl Checks for header files. - AC_HEADER_STDC -@@ -180,11 +195,6 @@ - enable_zip=no - fi]) - --AC_CHECK_HEADER(ffi.h,, -- [if test "$enable_ffi" != no; then -- AC_MSG_ERROR(cannot find ffi.h) -- fi]) -- - if test "$enable_zip" != no; then - AC_DEFINE([USE_ZIP],1,[use zip]) - use_zip_yes= -@@ -197,7 +207,7 @@ - AC_SUBST(use_zip_yes) - AC_SUBST(use_zip_no) - --if test "$enable_ffi" != no; then -+if test "x${LIBFFI_FOUND}" != no; then - AC_DEFINE([USE_FFI],1,[use FFI]) - fi - -Index: jamvm-1.4.5/src/Makefile.am -=================================================================== ---- jamvm-1.4.5.orig/src/Makefile.am 2006-12-25 05:10:18.000000000 +0100 -+++ jamvm-1.4.5/src/Makefile.am 2011-11-25 19:35:26.537723112 +0100 -@@ -19,6 +19,7 @@ - - jamvm_LDADD = libcore.la - libjvm_la_LIBADD = libcore.la --libcore_la_LIBADD = os/@os@/@arch@/libnative.la os/@os@/libos.la -+libcore_la_LIBADD = os/@os@/@arch@/libnative.la os/@os@/libos.la $(LIBFFI_LIBS) -+libcore_la_CPPFLAGS = $(LIBFFI_CFLAGS) - - DISTCLEANFILES = arch.h -- cgit v1.2.3-54-g00ecf