Greetings,
A patch for jamvm-1.4.2/amd64 follows; note dependency on libffi-4.1
(required for amd64 only)
which was previously announced.
The patch is for jamvm-1.4.2p0 in 3.9-current
Tested by me on my new Athalon 64; runs classpath examples.
Regards,
Fred
=======================================================================
diff -u -r jamvm/Makefile jamvm.new/Makefile
--- jamvm/Makefile Sat May 6 12:20:44 2006
+++ jamvm.new/Makefile Sat Jun 3 02:47:40 2006
@@ -5,7 +5,7 @@
ONLY_FOR_ARCHS= i386 powerpc arm amd64
DISTNAME= jamvm-1.4.2
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= lang java
@@ -23,13 +23,24 @@
USE_GMAKE= Yes
SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf automake
+USE_LIBTOOL= Yes
+AUTOMAKE_VERSION= 1.9
+AUTOCONF_VERSION= 2.59
+
RUN_DEPENDS= ::lang/classpath
WANTLIB= c m z pthread
-CONFIGURE_ARGS+= --with-classpath-install-dir=${LOCALBASE} \
+CONFIGURE_ARGS+= --with-classpath-install-dir=$(LOCALBASE) \
--includedir=${LOCALBASE}/include/jamvm
+
+.if $(MACHINE_ARCH) == "amd64"
+BUILD_DEPENDS+= ::devel/libffi
+CONFIGURE_ARGS+= \
+ "CPPFLAGS=-I$(LOCALBASE)/include
-I$(LOCALBASE)/lib/gcc/include/libffi" \
+ "LDFLAGS=-L$(LOCALBASE)/lib"
+.endif
.include <bsd.port.mk>
diff -u -r jamvm/patches/patch-configure_ac
jamvm.new/patches/patch-configure_ac
--- jamvm/patches/patch-configure_ac Sat Jun 3 03:05:04 2006
+++ jamvm.new/patches/patch-configure_ac Sat May 20 21:19:35 2006
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- configure.ac.orig Tue Jan 17 20:35:06 2006
++++ configure.ac Sat May 20 21:19:01 2006
+@@ -61,6 +61,7 @@ i[[456]]86-*-kfreebsd*) host_cpu=i386 ho
+ i386-*-openbsd*) host_os=linux libdl_needed=no ;;
+ i386-*-freebsd*) host_os=linux libdl_needed=no ;;
+ x86_64-*-linux*) host_os=linux ;;
++x86_64-*-openbsd*) host_os=linux libdl_needed=no ;;
+ amd64-*-openbsd*) host_os=linux libdl_needed=no ;;
+ amd64-*-freebsd*) host_os=linux libdl_needed=no ;;
+ arm*-*-linux*) host_cpu=arm host_os=linux ;;
diff -u -r jamvm/Makefile jamvm.new/Makefile
--- jamvm/Makefile Sat May 6 12:20:44 2006
+++ jamvm.new/Makefile Sat Jun 3 02:47:40 2006
@@ -5,7 +5,7 @@
ONLY_FOR_ARCHS= i386 powerpc arm amd64
DISTNAME= jamvm-1.4.2
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= lang java
@@ -23,13 +23,24 @@
USE_GMAKE= Yes
SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf automake
+USE_LIBTOOL= Yes
+AUTOMAKE_VERSION= 1.9
+AUTOCONF_VERSION= 2.59
+
RUN_DEPENDS= ::lang/classpath
WANTLIB= c m z pthread
-CONFIGURE_ARGS+= --with-classpath-install-dir=${LOCALBASE} \
+CONFIGURE_ARGS+= --with-classpath-install-dir=$(LOCALBASE) \
--includedir=${LOCALBASE}/include/jamvm
+
+.if $(MACHINE_ARCH) == "amd64"
+BUILD_DEPENDS+= ::devel/libffi
+CONFIGURE_ARGS+= \
+ "CPPFLAGS=-I$(LOCALBASE)/include
-I$(LOCALBASE)/lib/gcc/include/libffi" \
+ "LDFLAGS=-L$(LOCALBASE)/lib"
+.endif
.include <bsd.port.mk>
diff -u -r jamvm/patches/patch-configure_ac jamvm.new/patches/patch-configure_ac
--- jamvm/patches/patch-configure_ac Sat Jun 3 03:05:04 2006
+++ jamvm.new/patches/patch-configure_ac Sat May 20 21:19:35 2006
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- configure.ac.orig Tue Jan 17 20:35:06 2006
++++ configure.ac Sat May 20 21:19:01 2006
+@@ -61,6 +61,7 @@ i[[456]]86-*-kfreebsd*) host_cpu=i386 ho
+ i386-*-openbsd*) host_os=linux libdl_needed=no ;;
+ i386-*-freebsd*) host_os=linux libdl_needed=no ;;
+ x86_64-*-linux*) host_os=linux ;;
++x86_64-*-openbsd*) host_os=linux libdl_needed=no ;;
+ amd64-*-openbsd*) host_os=linux libdl_needed=no ;;
+ amd64-*-freebsd*) host_os=linux libdl_needed=no ;;
+ arm*-*-linux*) host_cpu=arm host_os=linux ;;
