From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 15:18:06 2013 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 418A039B; Wed, 30 Oct 2013 15:18:06 +0000 (UTC) (envelope-from brooks@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F22A299B; Wed, 30 Oct 2013 15:18:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UFI6qG026140; Wed, 30 Oct 2013 15:18:06 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UFI5ZZ026138; Wed, 30 Oct 2013 15:18:05 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201310301518.r9UFI5ZZ026138@svn.freebsd.org> From: Brooks Davis Date: Wed, 30 Oct 2013 15:18:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332126 - in head/lang: clang32 clang33 X-SVN-Group: ports-head 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.14 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, 30 Oct 2013 15:18:06 -0000 Author: brooks Date: Wed Oct 30 15:18:05 2013 New Revision: 332126 URL: http://svnweb.freebsd.org/changeset/ports/332126 Log: If the ASSERTS option is enabled, make sure it was enabled in the corresponding devel/llvm## port as build fails otherwise. Modified: head/lang/clang32/Makefile head/lang/clang33/Makefile Modified: head/lang/clang32/Makefile ============================================================================== --- head/lang/clang32/Makefile Wed Oct 30 15:16:28 2013 (r332125) +++ head/lang/clang32/Makefile Wed Oct 30 15:18:05 2013 (r332126) @@ -78,6 +78,17 @@ RELTYPE= Release BROKEN= Does not compile on sparc64 .endif +.if ${PORT_OPTIONS:MASSERTS} +pre-fetch: + @if [ "`llvm-config${LLVM_SUFFIX} --build-mode`" != ${RELTYPE} ]; then \ + ${ECHO_MSG} ;\ + ${ECHO_MSG} ASSERTS option enabled, but devel/llvm${LLVM_SUFFIX} was compiled without ASSERTS. ;\ + ${ECHO_MSG} Correct options mismatch to proceed. ;\ + ${ECHO_MSG} ;\ + false ;\ + fi +.endif + post-extract: ${RM} -f ${BUILD_WRKSRC} ${MV} ${WRKDIR}/${CLANG_NAME} ${BUILD_WRKSRC} Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Wed Oct 30 15:16:28 2013 (r332125) +++ head/lang/clang33/Makefile Wed Oct 30 15:18:05 2013 (r332126) @@ -79,6 +79,17 @@ RELTYPE= Release BROKEN= Does not compile on sparc64 .endif +.if ${PORT_OPTIONS:MASSERTS} +pre-fetch: + @if [ "`llvm-config${LLVM_SUFFIX} --build-mode`" != ${RELTYPE} ]; then \ + ${ECHO_MSG} ;\ + ${ECHO_MSG} ASSERTS option enabled, but devel/llvm${LLVM_SUFFIX} was compiled without ASSERTS. ;\ + ${ECHO_MSG} Correct options mismatch to proceed. ;\ + ${ECHO_MSG} ;\ + false ;\ + fi +.endif + post-extract: ${RM} -f ${BUILD_WRKSRC} ${MV} ${WRKDIR}/${CLANG_NAME} ${BUILD_WRKSRC}