svn commit: r432931 - in head/Mk: Scripts Uses

[Mathieu Arnold]

Author: mat
Date: Tue Jan 31 16:21:22 2017
New Revision: 432931
URL: https://svnweb.freebsd.org/changeset/ports/432931

Log:
  Tell Module::Build to use LOCALBASE/bin/perl and not
  LOCALBASE/bin/perl5.xx.y.
  
  Add a QA check to test for it.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/Scripts/qa.sh   (contents, props changed)
  head/Mk/Uses/perl5.mk

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Tue Jan 31 16:21:18 2017	(r432930)
+++ head/Mk/Scripts/qa.sh	Tue Jan 31 16:21:22 2017	(r432931)
@@ -45,6 +45,11 @@ shebangonefile() {
 	case "${interp}" in
 	"") ;;
 	${LINUXBASE}/*) ;;
+	${LOCALBASE}/bin/perl5.* | ${PREFIX}/bin/perl5.*)
+		err "'${interp}' is an invalid shebang for '${f#${STAGEDIR}${PREFIX}/}' you must use ${LOCALBASE}/bin/perl."
+		err "Either pass \${PERL} to the build or use USES=shebangfix"
+		rc=1
+		;;
 	${LOCALBASE}/*) ;;
 	${PREFIX}/*) ;;
 	/bin/csh) ;;

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Tue Jan 31 16:21:18 2017	(r432930)
+++ head/Mk/Uses/perl5.mk	Tue Jan 31 16:21:22 2017	(r432931)
@@ -192,7 +192,8 @@ CONFIGURE_ARGS+=--install_path lib="${PR
 		--install_path script="${PREFIX}/bin" \
 		--install_path bin="${PREFIX}/bin" \
 		--install_path libdoc="${MAN3PREFIX}/man/man3" \
-		--install_path bindoc="${MAN1PREFIX}/man/man1"
+		--install_path bindoc="${MAN1PREFIX}/man/man1" \
+		--perl="${PERL}"
 CONFIGURE_SCRIPT?=	Build.PL
 PL_BUILD?=	Build
 CONFIGURE_ARGS+=--destdir ${STAGEDIR}