Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Eric Sandall (77055155033172bffac04bd2978399ea357d3fd7)

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 stable-rc-0.7 grimoire by Eric Sandall (77055155033172bffac04bd2978399ea357d3fd7)
  • Date: Wed, 14 Feb 2007 13:49:13 -0600

GIT changes to stable-rc-0.7 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

perl-cpan/perl/BUILD | 53
++++++++++++++++++-----------------------------
perl-cpan/perl/CONFIGURE | 32 ++++++++++++++++------------
perl-cpan/perl/HISTORY | 12 ++++++++++
3 files changed, 52 insertions(+), 45 deletions(-)

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)

diff --git a/perl-cpan/perl/BUILD b/perl-cpan/perl/BUILD
index 888ab5f..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,45 +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 depend &&
-make
-
-#if [ "$OLD_CUSTOM" == "y" ]; then
-# cp $CONFIG ./config.sh &&
-# ./Configure -S -Dprefix=/usr -Dvendorprefix=/usr
-Dvendorman1dir=$VENDORMAN1DIR -Dvendorman3dir=$VENDORMAN3DIR &&
-# make depend
-#else
-# if [ "$NEW_CUSTOM" == "y" ]; then
-# ./Configure -Ui_db -Dprefix=/usr -Dvendorprefix=/usr
-Dvendorman1dir=$VENDORMAN1DIR -Dvendorman3dir=$VENDORMAN3DIR \
-# -Dlibperl=libperl.so &&
-# cp config.sh $CONFIG
-# else
-# if [ "$THREADED" == "y" ]; then
-# ./Configure -Dprefix=/usr -d -e \
-# -Ui_db -Dvendorprefix=/usr
-Dvendorman1dir=$VENDORMAN1DIR -Dvendorman3dir=$VENDORMAN3DIR -Dusethreads
-Ulocincpth -Dlibperl=libperl.so
-# else
-# ./Configure -Dprefix=/usr -d -e \
-# -Ui_db -Dvendorprefix=/usr
-Dvendorman1dir=$VENDORMAN1DIR -Dvendorman3dir=$VENDORMAN3DIR -Ulocincpth
-Dlibperl=libperl.so
-# fi
-# fi
-#fi &&
-#make

+make_single &&
+make depend &&
+make &&
+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..42b77fe 100755
--- a/perl-cpan/perl/CONFIGURE
+++ b/perl-cpan/perl/CONFIGURE
@@ -1,21 +1,27 @@
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 [[ -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

Archive powered by MHonArc 2.6.24.

Top of Page