Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (8100974386775352dafc24d7c72aad7e9d87680c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (8100974386775352dafc24d7c72aad7e9d87680c)
  • Date: Tue, 13 Feb 2007 18:16:16 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

perl-cpan/perl/CONFIGURE | 22 ++++++++++++++--------
perl-cpan/perl/HISTORY | 2 ++
2 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 8100974386775352dafc24d7c72aad7e9d87680c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

perl cannot use old config between versions (Bug #10731)

diff --git a/perl-cpan/perl/CONFIGURE b/perl-cpan/perl/CONFIGURE
index 137ae90..42b77fe 100755
--- a/perl-cpan/perl/CONFIGURE
+++ b/perl-cpan/perl/CONFIGURE
@@ -1,14 +1,20 @@
CONFIG_FILE="$DEPENDS_CONFIG/perl_config.sh" &&

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 [[ "$RM_OLD_CUSTOM" == "y" ]]; then
- rm "$CONFIG_FILE"
+ 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
# Just used for the check below
diff --git a/perl-cpan/perl/HISTORY b/perl-cpan/perl/HISTORY
index a2e6a52..7bae5c4 100644
--- a/perl-cpan/perl/HISTORY
+++ b/perl-cpan/perl/HISTORY
@@ -7,6 +7,8 @@
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 master grimoire by Eric Sandall (8100974386775352dafc24d7c72aad7e9d87680c), Eric Sandall, 02/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page