summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2007-02-13 08:41:22 -0800
committerEric Sandall2007-02-14 11:46:20 -0800
commitc909d6932edcbf302a0aa50c818452d3df98eaf9 (patch)
treee75fd193d1171ac2bcbc149a62254443c20c21e9
parent73fc67d5a3d2c9fd65c8c5c5bc18bafbbd102a02 (diff)
perl needs to build with make_single (Bug #10392)
(cherry picked from commit ecf3c43e7ad630b882b9565d95d318e47f75a71d)
-rwxr-xr-xperl-cpan/perl/BUILD28
-rw-r--r--perl-cpan/perl/HISTORY3
2 files changed, 7 insertions, 24 deletions
diff --git a/perl-cpan/perl/BUILD b/perl-cpan/perl/BUILD
index 888ab5f83f..aef6d0de4f 100755
--- a/perl-cpan/perl/BUILD
+++ b/perl-cpan/perl/BUILD
@@ -34,28 +34,8 @@ fi &&
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
diff --git a/perl-cpan/perl/HISTORY b/perl-cpan/perl/HISTORY
index 78a79b2bd9..7867802b87 100644
--- a/perl-cpan/perl/HISTORY
+++ b/perl-cpan/perl/HISTORY
@@ -1,3 +1,6 @@
+2007-02-13 Eric Sandall <eric@sandall.us>
+ * BUILD: Use make_single (Bug #10392)
+
2006-10-06 Juuso Alasuutari <iuso@sourcemage.org>
* perl.sh: Removed bashism.