From 74770df7e31271be5056ab757cc3d5875ef002e8 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 10 Jan 2013 19:42:26 +0100
Subject: jamvm-initial: rename patches directory for newer bitbake

---
 recipes-core/jamvm/jamvm-1.4.5/jamvm-initial.patch | 63 ++++++++++++++++++++
 recipes-core/jamvm/jamvm-1.4.5/libffi.patch        | 68 ++++++++++++++++++++++
 .../jamvm/jamvm-initial/jamvm-initial.patch        | 63 --------------------
 recipes-core/jamvm/jamvm-initial/libffi.patch      | 68 ----------------------
 4 files changed, 131 insertions(+), 131 deletions(-)
 create mode 100644 recipes-core/jamvm/jamvm-1.4.5/jamvm-initial.patch
 create mode 100644 recipes-core/jamvm/jamvm-1.4.5/libffi.patch
 delete mode 100644 recipes-core/jamvm/jamvm-initial/jamvm-initial.patch
 delete mode 100644 recipes-core/jamvm/jamvm-initial/libffi.patch

(limited to 'recipes-core')

diff --git a/recipes-core/jamvm/jamvm-1.4.5/jamvm-initial.patch b/recipes-core/jamvm/jamvm-1.4.5/jamvm-initial.patch
new file mode 100644
index 0000000..fb069f8
--- /dev/null
+++ b/recipes-core/jamvm/jamvm-1.4.5/jamvm-initial.patch
@@ -0,0 +1,63 @@
+Index: jamvm-1.4.5/configure.ac
+===================================================================
+--- jamvm-1.4.5.orig/configure.ac
++++ jamvm-1.4.5/configure.ac
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/jam.c)
+-AM_INIT_AUTOMAKE(jamvm, 1.4.5)
++AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5)
+ AC_CONFIG_HEADERS([src/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/jamvm)
+ 
+Index: jamvm-1.4.5/lib/Makefile.am
+===================================================================
+--- jamvm-1.4.5.orig/lib/Makefile.am
++++ jamvm-1.4.5/lib/Makefile.am
+@@ -1,4 +1,4 @@
+-@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
++@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip
+ @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/
+ 
+ SUBDIRS = jamvm java gnu sun
+Index: jamvm-1.4.5/src/dll.c
+===================================================================
+--- jamvm-1.4.5.orig/src/dll.c
++++ jamvm-1.4.5/src/dll.c
+@@ -294,7 +294,7 @@ char *getDllPath() {
+ }
+ 
+ char *getBootDllPath() {
+-    return CLASSPATH_INSTALL_DIR"/lib/classpath";
++    return CLASSPATH_INSTALL_DIR"/lib/classpath-initial";
+ }
+ 
+ char *getDllName(char *name) {
+Index: jamvm-1.4.5/src/Makefile.am
+===================================================================
+--- jamvm-1.4.5.orig/src/Makefile.am
++++ jamvm-1.4.5/src/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS = os
+ DIST_SUBDIRS = os arch
+ 
+ bin_PROGRAMS = jamvm
+-include_HEADERS = jni.h
++noinst_HEADERS = jni.h
+ 
+ lib_LTLIBRARIES = libjvm.la
+ noinst_LTLIBRARIES = libcore.la
+Index: jamvm-1.4.5/src/class.c
+===================================================================
+--- jamvm-1.4.5.orig/src/class.c
++++ jamvm-1.4.5/src/class.c
+@@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories) 
+ }
+ 
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
+-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
++#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip"
++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
+ #else
+ #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
diff --git a/recipes-core/jamvm/jamvm-1.4.5/libffi.patch b/recipes-core/jamvm/jamvm-1.4.5/libffi.patch
new file mode 100644
index 0000000..216f03c
--- /dev/null
+++ b/recipes-core/jamvm/jamvm-1.4.5/libffi.patch
@@ -0,0 +1,68 @@
+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
diff --git a/recipes-core/jamvm/jamvm-initial/jamvm-initial.patch b/recipes-core/jamvm/jamvm-initial/jamvm-initial.patch
deleted file mode 100644
index fb069f8..0000000
--- a/recipes-core/jamvm/jamvm-initial/jamvm-initial.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: jamvm-1.4.5/configure.ac
-===================================================================
---- jamvm-1.4.5.orig/configure.ac
-+++ jamvm-1.4.5/configure.ac
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(src/jam.c)
--AM_INIT_AUTOMAKE(jamvm, 1.4.5)
-+AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5)
- AC_CONFIG_HEADERS([src/config.h])
- AC_PREFIX_DEFAULT(/usr/local/jamvm)
- 
-Index: jamvm-1.4.5/lib/Makefile.am
-===================================================================
---- jamvm-1.4.5.orig/lib/Makefile.am
-+++ jamvm-1.4.5/lib/Makefile.am
-@@ -1,4 +1,4 @@
--@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
-+@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip
- @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/
- 
- SUBDIRS = jamvm java gnu sun
-Index: jamvm-1.4.5/src/dll.c
-===================================================================
---- jamvm-1.4.5.orig/src/dll.c
-+++ jamvm-1.4.5/src/dll.c
-@@ -294,7 +294,7 @@ char *getDllPath() {
- }
- 
- char *getBootDllPath() {
--    return CLASSPATH_INSTALL_DIR"/lib/classpath";
-+    return CLASSPATH_INSTALL_DIR"/lib/classpath-initial";
- }
- 
- char *getDllName(char *name) {
-Index: jamvm-1.4.5/src/Makefile.am
-===================================================================
---- jamvm-1.4.5.orig/src/Makefile.am
-+++ jamvm-1.4.5/src/Makefile.am
-@@ -2,7 +2,7 @@ SUBDIRS = os
- DIST_SUBDIRS = os arch
- 
- bin_PROGRAMS = jamvm
--include_HEADERS = jni.h
-+noinst_HEADERS = jni.h
- 
- lib_LTLIBRARIES = libjvm.la
- noinst_LTLIBRARIES = libcore.la
-Index: jamvm-1.4.5/src/class.c
-===================================================================
---- jamvm-1.4.5.orig/src/class.c
-+++ jamvm-1.4.5/src/class.c
-@@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories) 
- }
- 
- #ifdef USE_ZIP
--#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
--#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
-+#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip"
-+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
- #else
- #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
- #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
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