Skip to Content.
Sympa Menu

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

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 (9dea7bb73e89e6ab4d310d2950fca2903c068963)
  • Date: Tue, 13 Feb 2007 12:29:59 -0600

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

perl-cpan/perl/BUILD | 29 +++++++++++++++++++----------
perl-cpan/perl/CONFIGURE | 24 ++++++++++++------------
perl-cpan/perl/HISTORY | 7 +++++++
3 files changed, 38 insertions(+), 22 deletions(-)

New commits:
commit 9dea7bb73e89e6ab4d310d2950fca2903c068963
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

perl's custom config would not enable prompts (Bug #10493)

diff --git a/perl-cpan/perl/BUILD b/perl-cpan/perl/BUILD
index aef6d0d..aff1024 100755
--- a/perl-cpan/perl/BUILD
+++ b/perl-cpan/perl/BUILD
@@ -6,7 +6,7 @@ if ! declare -f up_trigger > /dev/null;
persistent_add PREVIOUS_VERSION &&
PREVIOUS_VERSION="`installed_version perl`"
fi &&
-CONFIG="$DEPENDS_CONFIG/perl_config.sh" &&
+local PERL_CONFIG="$DEPENDS_CONFIG/perl_config.sh" &&

SITEMAN1DIR="${INSTALL_ROOT}/usr/share/site_perl/man/man1" &&
SITEMAN3DIR="${INSTALL_ROOT}/usr/share/site_perl/man/man3" &&
@@ -17,25 +17,34 @@ PERL_PATHS="-Dprefix=/usr \
-Dvendorprefix=/usr -Dvendorman1dir=$VENDORMAN1DIR
-Dvendorman3dir=$VENDORMAN3DIR \
-Dsiteprefix=/usr -Dsiteman1dir=$SITEMAN1DIR
-Dsiteman3dir=$SITEMAN3DIR " &&

-CONFIG_OPTS="-Ui_db -Duseshrplib -Ulocincpth=" &&
+local CONFIG_OPTS="-Ui_db -Duseshrplib -Ulocincpth=" &&

if glibc_is_nptl; then
LDFLAGS="$LDFLAGS -lpthread"
fi &&

-if [ "$OLD_CUSTOM" == "y" ]; then
+if [[ "$OLD_CUSTOM" == "y" ]]; then
CONFIG_OPTS="-S "
- cp $CONFIG ./config.sh
+ cp $PERL_CONFIG ./config.sh
fi &&

-[ "$THREADED" == "y" ] && CONFIG_OPTS="$CONFIG_OPTS -Dusethreads"
-[ "$OLD_CUSTOM" != "y" ] && [ "NEW_CUSTOM" != "y" ] && CONFIG_OPTS="-d -e
$CONFIG_OPTS"
+if [[ "$THREADED" == "y" ]]; then
+ CONFIG_OPTS="$CONFIG_OPTS -Dusethreads"
+fi &&
+
+if [[ "$NEW_CUSTOM" != "y" ]]; then
+ CONFIG_OPTS="-d -e $CONFIG_OPTS"
+else
+ rm -f config.sh
+fi &&
+
./Configure -Doptimize="$CFLAGS" $CONFIG_OPTS $PERL_PATHS &&
-if [ "$NEW_CUSTOM" == "y" ]; then
- cp config.sh $CONFIG
-fi &&

make_single &&
make depend &&
make &&
-make_normal
+make_normal &&
+
+if [[ "$NEW_CUSTOM" == "y" ]]; then
+ cp config.sh $PERL_CONFIG
+fi
diff --git a/perl-cpan/perl/CONFIGURE b/perl-cpan/perl/CONFIGURE
index b5ea553..137ae90 100755
--- a/perl-cpan/perl/CONFIGURE
+++ b/perl-cpan/perl/CONFIGURE
@@ -1,21 +1,21 @@
CONFIG_FILE="$DEPENDS_CONFIG/perl_config.sh" &&

-if [ -f $CONFIG_FILE ]; then
- config_query OLD_CUSTOM "Use old custom configuration for Perl?" y
+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 [[ "$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"
+ 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 7867802..a2e6a52 100644
--- a/perl-cpan/perl/HISTORY
+++ b/perl-cpan/perl/HISTORY
@@ -1,5 +1,12 @@
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

2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* perl.sh: Removed bashism.



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (9dea7bb73e89e6ab4d310d2950fca2903c068963), Eric Sandall, 02/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page