Throw the switch that only includes bsd.perl.mk if the port really
requires it. This is guaranteed to break quite a number of ports; email linimon if you find one. This patch is currently being tested on pointyhat to help identify them.
This commit is contained in:
parent
21a486fcf7
commit
9ad41f70ad
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=200080
1 changed files with 5 additions and 4 deletions
|
@ -1401,6 +1401,7 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
|
|||
|
||||
# XXX to remain undefined until all ports that require Perl are fixed
|
||||
# to set one of the conditionals that force the inclusion of bsd.perl.mk
|
||||
_PERL_REFACTORING_COMPLETE= BEING_TESTED
|
||||
.if !defined(_PERL_REFACTORING_COMPLETE)
|
||||
|
||||
PERL_VERSION?= 5.8.8
|
||||
|
@ -1470,13 +1471,13 @@ PERL= ${LOCALBASE}/bin/perl
|
|||
.endif
|
||||
.endif
|
||||
|
||||
#.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
|
||||
.if defined(WANT_PERL) || defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
|
||||
.if exists(${DEVELPORTSDIR}/Mk/bsd.perl.mk)
|
||||
.include "${DEVELPORTSDIR}/Mk/bsd.perl.mk"
|
||||
.else
|
||||
.include "${PORTSDIR}/Mk/bsd.perl.mk"
|
||||
.endif
|
||||
#.endif
|
||||
.endif
|
||||
|
||||
.if defined(USE_PHP)
|
||||
.if exists(${DEVELPORTSDIR}/Mk/bsd.php.mk)
|
||||
|
@ -2122,13 +2123,13 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
|
|||
.endif
|
||||
.endif
|
||||
|
||||
#.if defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
|
||||
.if defined(WANT_PERL) || defined(USE_PERL5) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
|
||||
.if exists(${DEVELPORTSDIR}/Mk/bsd.perl.mk)
|
||||
.include "${DEVELPORTSDIR}/Mk/bsd.perl.mk"
|
||||
.else
|
||||
.include "${PORTSDIR}/Mk/bsd.perl.mk"
|
||||
.endif
|
||||
#.endif
|
||||
.endif
|
||||
|
||||
.if defined(USE_PHP)
|
||||
.if exists(${DEVELPORTSDIR}/Mk/bsd.php.mk)
|
||||
|
|
Loading…
Reference in a new issue