Date: Mon, 10 Feb 2020 18:47:23 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525748 - head/editors/vim Message-ID: <202002101847.01AIlNS9017317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Feb 10 18:47:23 2020 New Revision: 525748 URL: https://svnweb.freebsd.org/changeset/ports/525748 Log: Fix stage-qa of shebang with PYTHON option disabled after r522484 The error message (in poudriere) is as follows: ====> Running Q/A tests (stage-qa) Error: '/usr/local/bin/python' is an invalid shebang you need USES=shebangfix for 'share/vim/vim82/tools/demoserver.py.bak' r522484 adds a new REINPLACE_CMD check which is enabled when DEVELOPER=yes. It does not respect REINPLACE_ARGS (-i ''), thus runtime/tools/demoserver.py.bak is generated. Vim installs everything in runtime/tools [1] which fails in stage-qa for invalid shebang. This workaround uses USES=python:env. It will replace the shebang with default python (/usr/local/bin/python3.7). [1] from src/Makefile: # install the runtime tools $(INSTALL_DATA_R) $(TOOLSSOURCE)/* $(DEST_TOOLS) PR: 243961 Reported by: salvadore Submitted by: sunpoet (myself) Approved by: adamw (maintainer) Modified: head/editors/vim/Makefile Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Mon Feb 10 18:47:18 2020 (r525747) +++ head/editors/vim/Makefile Mon Feb 10 18:47:23 2020 (r525748) @@ -31,7 +31,6 @@ GNU_CONFIGURE= yes PLIST_SUB= VIM_VER=${VIM_VER} PORTDATA?= ${VIM_VER} PORTSCOUT= ignore:1 -REINPLACE_ARGS= -i '' SHEBANG_FILES= runtime/tools/demoserver.py runtime/tools/efm_perl.pl VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} @@ -134,6 +133,7 @@ PERL_CONFIGURE_ENABLE= perlinterp PERL_USES= perl5 PYTHON_USES= python +PYTHON_USES_OFF= python:env RUBY_CONFIGURE_ENABLE= rubyinterp RUBY_USE= RUBY=yes @@ -167,8 +167,6 @@ post-patch: ${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h ${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/auto/configure -# Work around qa-check shebang error - ${REINPLACE_CMD} -e 1d ${WRKSRC}/runtime/tools/demoserver.py post-configure: # Needed when devel/libsysinfo is installed:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002101847.01AIlNS9017317>