Merge pull request #693 from dm0-/build-1409

Transition stable to handle Perl 5.24
This commit is contained in:
David Michael 2017-06-26 16:50:00 -07:00 committed by GitHub
commit bb5cf7acd1

View File

@ -197,13 +197,11 @@ if [[ "${FLAGS_jobs}" -ne -1 ]]; then
REBUILD_FLAGS+=( "--jobs=${FLAGS_jobs}" )
fi
# Force rebuilding some misbehaving Perl modules for the 5.22 upgrade.
if : || portageq has_version / '<dev-lang/perl-5.22'; then
EMERGE_FLAGS+=(
--reinstall-atoms='dev-perl/File-Slurp dev-perl/Locale-gettext perl-core/File-Temp'
--usepkg-exclude='dev-perl/File-Slurp dev-perl/Locale-gettext perl-core/File-Temp'
)
fi
# Force rebuilding some misbehaving Perl modules to downgrade from 5.24.
EMERGE_FLAGS+=(
--reinstall-atoms='dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/XML-Parser perl-core/File-Temp virtual/perl-File-Temp'
--usepkg-exclude='dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/XML-Parser perl-core/File-Temp virtual/perl-File-Temp'
)
# Perform an update of coreos-devel/sdk-depends and world in the chroot.
EMERGE_CMD="emerge"