Attachment 145209 Details for Bug 192305 – patch to update

[patch] patch to update

jamvm.diff (text/plain), 3.62 KB, created by Kurt Jaeger on 2014-08-01 11:33:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2014-08-01 11:33:55 UTC

Size: 3.62 KB

patch

obsolete

>diff -r -u -N java/jamvm/Makefile /usr/home/pi/myp/java/jamvm/Makefile
>--- java/jamvm/Makefile	2014-06-09 10:13:21.000000000 +0200
>+++ /usr/home/pi/myp/java/jamvm/Makefile	2014-08-01 13:17:29.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/java/jamvm/Makefile 350778 2014-04-10 06:41:21Z bapt $
> 
> PORTNAME=	jamvm
>-PORTVERSION=	1.5.4
>+PORTVERSION=	2.0.0
> CATEGORIES=	java devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
> 
>@@ -15,7 +15,8 @@
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-classpath-install-dir=${LOCALBASE}
>-USES=		gmake pkgconfig
>+CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
>+USES=		gmake pkgconfig libtool
> 
> OPTIONS_DEFINE=	FFI ZIP
> OPTIONS_DEFAULT=FFI ZIP
>diff -r -u -N java/jamvm/distinfo /usr/home/pi/myp/java/jamvm/distinfo
>--- java/jamvm/distinfo	2014-06-09 10:13:21.000000000 +0200
>+++ /usr/home/pi/myp/java/jamvm/distinfo	2014-08-01 11:22:21.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (jamvm-1.5.4.tar.gz) = 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
>-SIZE (jamvm-1.5.4.tar.gz) = 656283
>+SHA256 (jamvm-2.0.0.tar.gz) = 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da
>+SIZE (jamvm-2.0.0.tar.gz) = 741459
>diff -r -u -N java/jamvm/files/patch-configure /usr/home/pi/myp/java/jamvm/files/patch-configure
>--- java/jamvm/files/patch-configure	2014-06-09 10:13:21.000000000 +0200
>+++ /usr/home/pi/myp/java/jamvm/files/patch-configure	2014-08-01 13:26:50.000000000 +0200
>@@ -1,16 +1,7 @@
>---- configure.orig	2009-12-31 13:41:44.000000000 -0500
>-+++ 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 ;;
>- x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
>--x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
>-+amd64-*-freebsd*) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
>- 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
>+--- ./configure.orig	2014-06-10 22:39:57.000000000 +0200
>++++ ./configure	2014-08-01 13:26:41.000000000 +0200
>+@@ -12882,8 +12882,16 @@
>+ if ${ac_cv_lib_ffi_ffi_call+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
> +  ac_check_lib_save_CFLAGS=$CFLAGS
>@@ -23,19 +14,11 @@
> +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 >conftest.$ac_ext
>+ /* end confdefs.h.  */
>+ 
>+@@ -12917,9 +12925,9 @@
>    cat >>confdefs.h <<_ACEOF
>  #define HAVE_LIBFFI 1
>  _ACEOF
>@@ -46,5 +29,5 @@
> +  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;}
>+   as_fn_error $? "libffi is missing" "$LINENO" 5
>+ fi
>diff -r -u -N java/jamvm/pkg-plist /usr/home/pi/myp/java/jamvm/pkg-plist
>--- java/jamvm/pkg-plist	2014-06-09 10:13:21.000000000 +0200
>+++ /usr/home/pi/myp/java/jamvm/pkg-plist	2014-08-01 13:29:58.000000000 +0200
>@@ -1,5 +1,4 @@
> bin/jamvm
>-lib/libjvm.la
> lib/libjvm.a
> %%WITH_ZIP%%lib/rt.jar
> %%WITH_ZIP%%%%DATADIR%%/classes.zip

Actions: View | Diff

Attachments on bug 192305: 145209 | 179542