summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-03-16 01:40:03 +0000
committerJay Freeman <saurik@saurik.com>2008-03-16 01:40:03 +0000
commitc7b03435c088e101cbb6e02bc55323b6929d4e63 (patch)
treee0bc23c263a18c75f72cf9240f09bf3c74d9c2de
parent776e9724d0d690c3dfdd1d77a31b8c64550b8347 (diff)
Moved to the newer, stabler, JamVM.
git-svn-id: http://svn.telesphoreo.org/trunk@187 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--data/jamvm/classpath.diff12
-rw-r--r--data/jamvm/jamvm-1.5.1b2.tar.gzbin583822 -> 0 bytes
-rw-r--r--data/jamvm/jamvm-20080302.tgzbin0 -> 226764 bytes
-rw-r--r--data/jamvm/libffi.diff17
-rw-r--r--data/jamvm/make.sh2
5 files changed, 13 insertions, 18 deletions
diff --git a/data/jamvm/classpath.diff b/data/jamvm/classpath.diff
new file mode 100644
index 000000000..dbab6f716
--- /dev/null
+++ b/data/jamvm/classpath.diff
@@ -0,0 +1,12 @@
+diff -ru jamvm-20080302/lib/Makefile.am jamvm-20080302+iPhone/lib/Makefile.am
+--- jamvm-20080302/lib/Makefile.am 2008-02-22 02:06:05.000000000 +0000
++++ jamvm-20080302+iPhone/lib/Makefile.am 2008-03-02 08:07:56.000000000 +0000
+@@ -48,7 +48,7 @@
+
+ classes.zip: $(JAVA_FILES)
+ -mkdir classes
+- $(JAVAC) -bootclasspath ${GLIBJ_ZIP} -d classes $(JAVA_FILES)
++ $(JAVAC) -bootclasspath ${PKG_ROOT}${GLIBJ_ZIP} -d classes $(JAVA_FILES)
+ cd classes && zip -r ../classes.zip .
+ rm -rf classes
+
diff --git a/data/jamvm/jamvm-1.5.1b2.tar.gz b/data/jamvm/jamvm-1.5.1b2.tar.gz
deleted file mode 100644
index 3be037659..000000000
--- a/data/jamvm/jamvm-1.5.1b2.tar.gz
+++ /dev/null
Binary files differ
diff --git a/data/jamvm/jamvm-20080302.tgz b/data/jamvm/jamvm-20080302.tgz
new file mode 100644
index 000000000..999695609
--- /dev/null
+++ b/data/jamvm/jamvm-20080302.tgz
Binary files differ
diff --git a/data/jamvm/libffi.diff b/data/jamvm/libffi.diff
deleted file mode 100644
index ced02134d..000000000
--- a/data/jamvm/libffi.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru jamvm-1.5.1/configure.ac jamvm-1.5.1+iPhone/configure.ac
---- jamvm-1.5.1/configure.ac 2007-12-16 04:05:21.000000000 +0000
-+++ jamvm-1.5.1+iPhone/configure.ac 2008-03-01 05:16:44.000000000 +0000
-@@ -238,10 +238,9 @@
- enable_zip=no
- fi])
-
--AC_CHECK_LIB(ffi,ffi_call,,
-- [if test "$enable_ffi" != no; then
-- AC_MSG_ERROR(cannot find libffi)
-- fi])
-+if test "$enable_ffi" != no; then
-+ AC_CHECK_LIB(ffi,ffi_call,,AC_MSG_ERROR(cannot find libffi))
-+fi
-
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/data/jamvm/make.sh b/data/jamvm/make.sh
index 117fc4093..b76cfc3d9 100644
--- a/data/jamvm/make.sh
+++ b/data/jamvm/make.sh
@@ -1,7 +1,7 @@
pkg:extract
cd *
pkg:patch
-autoconf
+PKG_CONF=./autogen.sh
CFLAGS=-O0 pkg:configure --with-classpath-install-dir=/usr --enable-ffi=no
make
pkg:install