Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Aug 2014 12:29:06 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365284 - head/Mk/Uses
Message-ID:  <201408181229.s7ICT6hX049435@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Aug 18 12:29:06 2014
New Revision: 365284
URL: http://svnweb.freebsd.org/changeset/ports/365284
QAT: https://qat.redports.org/buildarchive/r365284/

Log:
  Module::Build installs the empty bootstrap files, even with Perl 5.20, so
  remove the .if and always search and delete them.
  
  Noticed by:	pi
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/perl5.mk

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Mon Aug 18 12:27:31 2014	(r365283)
+++ head/Mk/Uses/perl5.mk	Mon Aug 18 12:29:06 2014	(r365284)
@@ -264,12 +264,11 @@ fix-packlist::
 	-@[ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
 .endif
 
-# Starting with perl 5.20, the empty bootstrap files are not installed any
-# more.  As we don't need them anyway, remove it altogether.
-.if ${PERL_LEVEL} < 502000
+# Starting with perl 5.20, the empty bootstrap files are not installed any more
+# by ExtUtils::MakeMaker.  As we don't need them anyway, remove them.
+# Module::Build continues to install them, so inconditionnaly remove the files.
 fix-perl-bs:
 	-@${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
-.endif
 
 .if !target(regression-test)
 TEST_ARGS+=	${MAKE_ARGS}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181229.s7ICT6hX049435>