New commits:
commit 77055155033172bffac04bd2978399ea357d3fd7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
perl cannot use old config between versions (Bug #10731)
(cherry picked from commit 8100974386775352dafc24d7c72aad7e9d87680c)
commit 5b2c17e881de22b9500e80f09b31e13c24aef4a4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
perl's custom config would not enable prompts (Bug #10493)
(cherry picked from commit 9dea7bb73e89e6ab4d310d2950fca2903c068963)
commit c909d6932edcbf302a0aa50c818452d3df98eaf9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
perl needs to build with make_single (Bug #10392)
(cherry picked from commit ecf3c43e7ad630b882b9565d95d318e47f75a71d)
-if [ -f $CONFIG_FILE ]; then
- config_query OLD_CUSTOM "Use old custom configuration for Perl?" y
-
- if [ "$OLD_CUSTOM" == "n" ]; then
- config_query RM_OLD_CUSTOM "Remove old custom configuration file ?" n
- fi
+if [[ -f $CONFIG_FILE ]]; then
+ if [[ "$(installed_version perl)" != "$VERSION" ]]; then
+ message "${MESSAGE_COLOR}Config changes between versions, using old
config is not an option. Removing $CONFIG_FILE${DEFAULT_COLOR}" &&
+ local OLD_CUSTOM="n" &&
+ rm -f "$CONFIG_FILE"
+ else
+ config_query OLD_CUSTOM "Use old custom configuration for Perl?" y
+
+ if [[ "$OLD_CUSTOM" == "n" ]]; then
+ config_query RM_OLD_CUSTOM "Remove old custom configuration file ?" n
+ fi &&
+
+ if [[ "$RM_OLD_CUSTOM" == "y" ]]; then
+ rm -f "$CONFIG_FILE"
+ fi
+ fi
else
- OLD_CUSTOM="n"
- RM_OLD_CUSTOM="n"
+ # Just used for the check below
+ local OLD_CUSTOM="n"
fi &&
-if [ "$RM_OLD_CUSTOM" == "y" ]; then
- rm "$CONFIG_FILE"
-fi
-
-if [ ! "$OLD_CUSTOM" == "y" ]; then
+if [[ "$OLD_CUSTOM" == "n" ]]; then
config_query NEW_CUSTOM "New custom configuration for Perl?" n
fi &&
diff --git a/perl-cpan/perl/HISTORY b/perl-cpan/perl/HISTORY
index 78a79b2..7bae5c4 100644
--- a/perl-cpan/perl/HISTORY
+++ b/perl-cpan/perl/HISTORY
@@ -1,3 +1,15 @@
+2007-02-13 Eric Sandall <eric AT sandall.us>
+ * BUILD: Use make_single (Bug #10392)
+ Do not check for OLD_CUSTOM != 'y' when checking NEW_CUSTOM != 'y',
+ on a 'clean' build OLD_CUSTOM will be unset or 'y', so no point.
+ Rename CONFIG to PERL_CONFIG
+ Make PERL_CONFIG and CONFIG_OPTS local
+ NEW_CUSTOM missing $ for variable (Bug #10493)
+ * CONFIGURE: Set OLD_CUSTOM locally just for the NEW_CUSTOM check
+ Moved the RM_OLD_CUSTOM query inside the check for CONFIG_FILE
+ Do not use old config if building a different version of perl
+ and remove the old config (Bug #10731)
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* perl.sh: Removed bashism.
[SM-Commit] GIT changes to stable-rc-0.7 grimoire by Eric Sandall (77055155033172bffac04bd2978399ea357d3fd7),
Eric Sandall, 02/14/2007