From owner-freebsd-java@FreeBSD.ORG Sun Mar 24 20:00:00 2013 Return-Path: Delivered-To: freebsd-java@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 883C912C for ; Sun, 24 Mar 2013 20:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6F47C1E0; Sun, 24 Mar 2013 20:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2OK00K2025317; Sun, 24 Mar 2013 20:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2OK000m025316; Sun, 24 Mar 2013 20:00:00 GMT (envelope-from gnats) Resent-Date: Sun, 24 Mar 2013 20:00:00 GMT Resent-Message-Id: <201303242000.r2OK000m025316@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: freebsd-java@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 016EEE72 for ; Sun, 24 Mar 2013 19:51:18 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mk-outboundfilter-1.mail.uk.tiscali.com (mk-outboundfilter-1.mail.uk.tiscali.com [212.74.114.37]) by mx1.freebsd.org (Postfix) with ESMTP id 84AB0182 for ; Sun, 24 Mar 2013 19:51:17 +0000 (UTC) Received: from host-2-102-106-22.as13285.net (HELO pegasus.bayofrum.net) ([2.102.106.22]) by smtp.pipex.tiscali.co.uk with ESMTP; 24 Mar 2013 19:50:00 +0000 Received: by pegasus.bayofrum.net (Postfix, from userid 1001) id E99E1894F; Sun, 24 Mar 2013 19:48:40 +0000 (GMT) Message-Id: <20130324194840.E99E1894F@pegasus.bayofrum.net> Date: Sun, 24 Mar 2013 19:48:40 +0000 (GMT) From: Chris Rees To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: freebsd-java@FreeBSD.org Subject: ports/177355: [PATCH] Remove != from bsd.java.mk X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Chris Rees List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Mar 2013 20:00:00 -0000 >Number: 177355 >Category: ports >Synopsis: [PATCH] Remove != from bsd.java.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 24 20:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 9.1-STABLE amd64 >Organization: >Environment: System: FreeBSD pegasus.bayofrum.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r247189: Sat Feb 23 15:20:18 GMT 2013 root@pegasus.bayofrum.net:/usr/obj/usr/home/crees/workspace/src/stable/9/sys/PEGASUS amd64 >Description: bmake complains about != assignments that give no output. Rather than simply hack around using echo, this patch uses actual Make logic to look inside the variables. This should be much faster. >How-To-Repeat: >Fix: --- bsd-java-mk-remove-bang.diff begins here --- Index: bsd.java.mk =================================================================== --- bsd.java.mk (revision 312626) +++ bsd.java.mk (working copy) @@ -214,15 +214,27 @@ # Error checking: JAVA_VERSION .if !defined(_JAVA_VERSION_LIST_REGEXP) -_JAVA_VERSION_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_VERSION_LIST}" | ${SED} "s/ /\\\|/g" +. for v in ${_JAVA_VERSION_LIST} +. if defined(_JAVA_VERSION_LIST_REGEXP) +_JAVA_VERSION_LIST_REGEXP:= ${_JAVA_VERSION_LIST_REGEXP}\| +. endif +_JAVA_VERSION_LIST_REGEXP:= ${_JAVA_VERSION_LIST_REGEXP}$v +. endfor .endif + + check-makevars:: @test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VERSION_LIST_REGEXP}" || \ (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})) || true # Error checking: JAVA_VENDOR .if !defined(_JAVA_VENDOR_LIST_REGEXP) -_JAVA_VENDOR_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_VENDOR_LIST}" | ${SED} "s/ /\\\|/g" +. for v in ${_JAVA_VENDOR_LIST} +. if defined(_JAVA_VENDOR_LIST_REGEXP) +_JAVA_VENDOR_LIST_REGEXP:= ${_JAVA_VENDOR_LIST_REGEXP}\| +. endif +_JAVA_VENDOR_LIST_REGEXP:= ${_JAVA_VENDOR_LIST_REGEXP}$v +. endfor .endif check-makevars:: @test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VENDOR_LIST_REGEXP}" || \ @@ -231,7 +243,12 @@ # Error checking: JAVA_OS .if !defined(_JAVA_OS_LIST_REGEXP) -_JAVA_OS_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_OS_LIST}" | ${SED} "s/ /\\\|/g" +. for v in ${_JAVA_OS_LIST} +. if defined(_JAVA_OS_LIST_REGEXP) +_JAVA_OS_LIST_REGEXP:= ${_JAVA_OS_LIST_REGEXP}\| +. endif +_JAVA_OS_LIST_REGEXP:= ${_JAVA_OS_LIST_REGEXP}$v +. endfor .endif check-makevars:: @test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_OS_LIST_REGEXP}" || \ @@ -273,26 +290,23 @@ A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/} A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,} A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,} -.if !defined(_JAVA_PORTS_INSTALLED) -A_JAVA_PORT_INSTALLED!= ${TEST} -x "${A_JAVA_PORT_HOME}/${_JDK_FILE}" \ - && ${ECHO_CMD} "${A_JAVA_PORT}" \ - || ${TRUE} -__JAVA_PORTS_INSTALLED!= ${ECHO_CMD} "${__JAVA_PORTS_INSTALLED} ${A_JAVA_PORT_INSTALLED}" +.if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE}) +__JAVA_PORTS_INSTALLED+= ${A_JAVA_PORT} .endif -# The magic here is that we want to test for a substring using only shell builtins (to avoid forking) -# Our shell does not have an explicit substring operator, but we can build one by using the '#' -# deletion operator ('%' would also work). We try to delete the pattern "*${substr}*" and compare it -# to the original string. If they differ, the substring matched. -# -# We can't do this in make because it doesn't allow nested modifiers ${foo:${bar}} +# Because variables inside for loops are special (directly replaced as strings), we are allowed +# to use them inside modifiers, where normally ${FOO:M${BAR}} is not allowed. # -A_JAVA_PORT_POSSIBLE!= ver="${_JAVA_VERSION}"; os="${_JAVA_OS}"; vendor="${_JAVA_VENDOR}"; \ - ${TEST} "$${ver\#*${A_JAVA_PORT_VERSION}*}" != "${_JAVA_VERSION}" -a \ - "$${os\#*${A_JAVA_PORT_OS}*}" != "${_JAVA_OS}" -a \ - "$${vendor\#*${A_JAVA_PORT_VENDOR}*}" != "${_JAVA_VENDOR}" && \ - ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} -__JAVA_PORTS_POSSIBLE:= ${__JAVA_PORTS_POSSIBLE} ${A_JAVA_PORT_POSSIBLE} +.for ver in ${A_JAVA_PORT_VERSION} +.for os in ${A_JAVA_PORT_OS} +.for vendor in ${A_JAVA_PORT_VENDOR} +.if ${_JAVA_VERSION:M${ver}} && ${_JAVA_OS:M${os}} && ${_JAVA_VENDOR:M${vendor}} +__JAVA_PORTS_POSSIBLE+= ${A_JAVA_PORT} +.endif +.endfor +.endfor +.endfor + . endfor .if !defined(_JAVA_PORTS_INSTALLED) _JAVA_PORTS_INSTALLED= ${__JAVA_PORTS_INSTALLED:C/ [ ]+/ /g} @@ -309,10 +323,7 @@ . undef _JAVA_PORTS_INSTALLED_POSSIBLE . for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE} -A_JAVA_PORT_INSTALLED_POSSIBLE!= inst="${_JAVA_PORTS_INSTALLED}"; \ - ${TEST} "$${inst\#*${A_JAVA_PORT}*}" != "${_JAVA_PORTS_INSTALLED}" && \ - ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} -__JAVA_PORTS_INSTALLED_POSSIBLE:= ${__JAVA_PORTS_INSTALLED_POSSIBLE} ${A_JAVA_PORT_INSTALLED_POSSIBLE} +__JAVA_PORTS_INSTALLED_POSSIBLE+= ${_JAVA_PORTS_INSTALLED:M${A_JAVA_PORT}} . endfor _JAVA_PORTS_INSTALLED_POSSIBLE= ${__JAVA_PORTS_INSTALLED_POSSIBLE:C/[ ]+//g} --- bsd-java-mk-remove-bang.diff ends here --- -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. >Release-Note: >Audit-Trail: >Unformatted: