svn commit: r508709 - head/shells/ksh93
Tobias Kortkamp
tobik at FreeBSD.org
Mon Aug 12 07:17:09 UTC 2019
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 <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list