From owner-svn-ports-all@FreeBSD.ORG Wed Jan 14 22:22:02 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 580EC3DD; Wed, 14 Jan 2015 22:22:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37AF8855; Wed, 14 Jan 2015 22:22:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0EMM20r050558; Wed, 14 Jan 2015 22:22:02 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0EMM12o050556; Wed, 14 Jan 2015 22:22:01 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201501142222.t0EMM12o050556@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 14 Jan 2015 22:22:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r377055 - branches/2015Q1/java/jamvm X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2015 22:22:02 -0000 Author: jkim Date: Wed Jan 14 22:22:01 2015 New Revision: 377055 URL: https://svnweb.freebsd.org/changeset/ports/377055 QAT: https://qat.redports.org/buildarchive/r377055/ Log: MFH: r377048, r377049 Disable inline threaded version of interpreter when compiled with Clang to fix build on 10 and later. Modernize the port while I am here. Approved by: portmgr (bapt) Modified: branches/2015Q1/java/jamvm/Makefile branches/2015Q1/java/jamvm/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/java/jamvm/Makefile ============================================================================== --- branches/2015Q1/java/jamvm/Makefile Wed Jan 14 21:57:39 2015 (r377054) +++ branches/2015Q1/java/jamvm/Makefile Wed Jan 14 22:22:01 2015 (r377055) @@ -3,7 +3,7 @@ PORTNAME= jamvm PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION} @@ -14,33 +14,34 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath -GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE} -USES= gmake libtool pkgconfig +GNU_CONFIGURE= yes +OPTIONS_SUB= yes +USES= compiler gmake libtool pkgconfig OPTIONS_DEFINE= FFI ZIP OPTIONS_DEFAULT=FFI ZIP FFI_DESC= use libffi to call native methods ZIP_DESC= turn-on zip support in the bootstrap loader +FFI_CONFIGURE_ENABLE= ffi +FFI_LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi +ZIP_BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +ZIP_CONFIGURE_ENABLE= zip + .include -.if ${PORT_OPTIONS:MFFI} -LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi -CONFIGURE_ARGS+= --enable-ffi -.elif ${ARCH} == "sparc64" +.if empty(PORT_OPTIONS:MFFI) && ${ARCH} == "sparc64" IGNORE= for ${ARCH} requires libffi .endif -.if ${PORT_OPTIONS:MZIP} -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -PLIST_SUB+= WITH_ZIP="" WITHOUT_ZIP="@comment " -.else -CONFIGURE_ARGS+= --disable-zip -PLIST_SUB+= WITH_ZIP="@comment " WITHOUT_ZIP="" +.include + +.if ${COMPILER_TYPE} == clang +CONFIGURE_ARGS+= --disable-int-inlining .endif post-extract: @${REINPLACE_CMD} -e "s,\(^include_HEADERS = .*\)jni.h\(.*\),\1\2," ${WRKSRC}/src/Makefile.in -.include +.include Modified: branches/2015Q1/java/jamvm/pkg-plist ============================================================================== --- branches/2015Q1/java/jamvm/pkg-plist Wed Jan 14 21:57:39 2015 (r377054) +++ branches/2015Q1/java/jamvm/pkg-plist Wed Jan 14 22:22:01 2015 (r377055) @@ -2,23 +2,23 @@ bin/jamvm lib/libjvm.so lib/libjvm.so.0 lib/libjvm.so.0.0.0 -%%WITH_ZIP%%lib/rt.jar -%%WITH_ZIP%%%%DATADIR%%/classes.zip -%%WITHOUT_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMSystemProperties.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/ThreadInfoHelper.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/JarLauncher.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData$Unloader.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMClass.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader$PackageInfo.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMRuntime.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMString.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMThread.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMThrowable.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMConstructor.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMField.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMMethod.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/security/VMAccessController.class -%%WITHOUT_ZIP%%%%DATADIR%%/classes/sun/reflect/annotation/AnnotationInvocationHandler.class +%%ZIP%%lib/rt.jar +%%ZIP%%%%DATADIR%%/classes.zip +%%NO_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class +%%NO_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMSystemProperties.class +%%NO_ZIP%%%%DATADIR%%/classes/jamvm/ThreadInfoHelper.class +%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/JarLauncher.class +%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData$Unloader.class +%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClass.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader$PackageInfo.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMRuntime.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMString.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMThread.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMThrowable.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMConstructor.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMField.class +%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMMethod.class +%%NO_ZIP%%%%DATADIR%%/classes/java/security/VMAccessController.class +%%NO_ZIP%%%%DATADIR%%/classes/sun/reflect/annotation/AnnotationInvocationHandler.class