From owner-freebsd-java@FreeBSD.ORG Wed Mar 5 21:10:01 2014 Return-Path: Delivered-To: freebsd-java@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66A6AC3F for ; Wed, 5 Mar 2014 21:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3809ADD4 for ; Wed, 5 Mar 2014 21:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s25LA1IT052971 for ; Wed, 5 Mar 2014 21:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s25LA1On052970; Wed, 5 Mar 2014 21:10:01 GMT (envelope-from gnats) Date: Wed, 5 Mar 2014 21:10:01 GMT Message-Id: <201403052110.s25LA1On052970@freefall.freebsd.org> To: freebsd-java@FreeBSD.org Cc: From: dfilter@FreeBSD.ORG (dfilter service) Subject: Re: ports/184204: commit references a PR X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: dfilter service List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 21:10:01 -0000 The following reply was made to PR ports/184204; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/184204: commit references a PR Date: Wed, 5 Mar 2014 20:59:58 +0000 (UTC) Author: tijl Date: Wed Mar 5 20:59:50 2014 New Revision: 347142 URL: http://svnweb.freebsd.org/changeset/ports/347142 QAT: https://qat.redports.org/buildarchive/r347142/ Log: - Include bsd.port.pre.mk before testing if ICONV_LIB is empty. It is always empty without this. [1] - Add -DLIBICONV_PLUG to CFLAGS to enforce the use of libc iconv even when libiconv is installed. [2] PR: ports/184204 [1], ports/184782 [1], ports/186956 [2] Approved by: glewis (maintainer) Modified: head/java/openjdk7/Makefile Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Wed Mar 5 20:31:02 2014 (r347141) +++ head/java/openjdk7/Makefile Wed Mar 5 20:59:50 2014 (r347142) @@ -3,7 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ @@ -138,6 +138,12 @@ PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel PATCH= gpatch .endif +.include + +.if empty(ICONV_LIB) +MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG +.endif + post-patch: @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp @@ -180,4 +186,4 @@ post-install: # Register the VM "${LOCALBASE}/bin/registervm" "${INSTALLDIR}/bin/java # OpenJDK${JDK_MAJOR_VERSION}" -.include +.include _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"