From owner-svn-ports-head@freebsd.org Mon Aug 12 07:17:09 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BABD2CFD9C; Mon, 12 Aug 2019 07:17:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 466RxK4W7bz3QqY; Mon, 12 Aug 2019 07:17:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C5DF22F5F; Mon, 12 Aug 2019 07:17:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7C7H9Hq040423; Mon, 12 Aug 2019 07:17:09 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7C7H9de040422; Mon, 12 Aug 2019 07:17:09 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201908120717.x7C7H9de040422@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 12 Aug 2019 07:17:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508709 - head/shells/ksh93 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/shells/ksh93 X-SVN-Commit-Revision: 508709 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Aug 2019 07:17:09 -0000 Author: tobik Date: Mon Aug 12 07:17:09 2019 New Revision: 508709 URL: https://svnweb.freebsd.org/changeset/ports/508709 Log: shells/ksh93: Attempt to fix r508705 and unbreak index It fails basic sanity checks: make: "/usr/ports/shells/ksh93/Makefile" line 16: Malformed conditional (${USE_GCC} == "9") make: Fatal errors encountered -- cannot continue make: stopped in /usr/ports/shells/ksh93 PR: 239644 Pointy hat: cy Modified: head/shells/ksh93/Makefile Modified: head/shells/ksh93/Makefile ============================================================================== --- head/shells/ksh93/Makefile Mon Aug 12 05:15:28 2019 (r508708) +++ head/shells/ksh93/Makefile Mon Aug 12 07:17:09 2019 (r508709) @@ -13,10 +13,6 @@ LICENSE= EPL USES= compiler:c11 meson ninja python:build -.if ${USE_GCC} == "9" -BROKEN= GCC 9.1 changes the output of `gcc -E` which breaks the conf.sh script, fixed in shells/ksh93-devel -.endif - USE_GITHUB= yes GH_ACCOUNT= att GH_PROJECT= ast @@ -38,8 +34,12 @@ KSH93_EXTRA_PATCHES= ${FILESDIR}/extra-patch-install-a KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" -.include +.include +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} >= 90 +BROKEN= GCC 9.1 changes the output of `gcc -E` which breaks the conf.sh script, fixed in shells/ksh93-devel +.endif + post-patch: @${REINPLACE_CMD} -e '/for name in/ s|python.*|${PYTHON_CMD}|g' ${WRKSRC}/scripts/python.sh @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c @@ -50,4 +50,4 @@ post-patch: @# Keep portlint happy .endif -.include +.include