[Devil-linux-commit] build/scripts perl,1.29.2.1,1.29.2.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30904/scripts

Modified Files:
      Tag: rel-1-2-patches
	perl 
Log Message:
backport changes on how to compile perl modules, this should avoid those
compile problems


Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -d -r1.29.2.1 -r1.29.2.2
--- perl	25 Jun 2004 01:51:42 -0000	1.29.2.1
+++ perl	30 Jun 2004 11:19:32 -0000	1.29.2.2
@@ -28,42 +28,21 @@
 case $1 in
     build )
 		if [ "$CONFIG_PERL" = "y" ]; then
-			cd ext
-
-			rm -rf ./DB_File || exit 1
-
-			for FILE in $(ls $DL_DIR/src/perl-ext/*.tar.gz)
-			do
-				tar -xzf $FILE || exit 1
-			done
-
-			ln -sf DB_File-* DB_File || exit 1
-
-			for PATCH in $(ls $DL_DIR/src/perl-ext/*.diff.bz2)
-			do
-				bzcat $PATCH | patch -p0 || exit 1
-			done
-
-			cd ..
 			echo >> ./hints/linux.sh
 			echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh
 
-			./Configure -Dprefix=/usr -Dinstallprefix=$WORKDIR/tmp -d -e || exit 1
+			./Configure -Dprefix=/usr -Dinstallprefix=$WORKDIR/tmp -Dusedl -d -e || exit 1
 			# parallel build fails - do not user $PMAKE
 			make || exit 1
 			#make test || exit 1
 
-			strip_debug
+			#strip_debug
 
 			rm -rf $WORKDIR/tmp || exit 1
 			mkdir -p $WORKDIR/tmp || exit 1
 			make install || exit 1
 			rm -f /usr/share/man/man1/s2p.1 /usr/share/man/man1/psed.1 /usr/share/man/man1/c2ph.1 /usr/share/man/man1/pstruct.1
-			rm -f /usr/bin/perl
-			rm -f /usr/bin/perl5.8.0
-			rm -f /usr/bin/perl5.8.2
-			rm -f /usr/bin/perl5.8.3
-			rm -f /usr/bin/perl5.8.4
+			rm -f /usr/bin/perl*
 			rm -f /usr/bin/s2p /usr/bin/psed
 			rm -f /usr/bin/pstruct /usr/bin/c2ph
 			cp -vfdpR $WORKDIR/tmp/* /usr || exit 1
@@ -71,6 +50,32 @@
 			# delete the old perl version
 			test -d /usr/lib/perl5/5.8.0 && rm -rf /usr/lib/perl5/5.8.0
 			test -d /usr/lib/perl5/site_perl/5.8.0 && rm -rf /usr/lib/perl5/site_perl/5.8.0
+
+			# now let's take care of all the perl extension
+			rm -rf $WORKDIR/perl-ext
+			mkdir -p $WORKDIR/perl-ext || exit 1
+			cd $WORKDIR/perl-ext || exit 1
+
+			for FILE in $(ls $DL_DIR/src/perl-ext/*.tar.gz $DL_DIR/src/perl-ext/*.tar.bz2)
+			do
+				tar -xzf $FILE || exit 1
+			done
+
+			for PATCH in $(ls $DL_DIR/src/perl-ext/*.diff.bz2)
+			do
+				bzcat $PATCH | patch -p0 || exit 1
+			done
+
+			for EXT in $(ls -d *)
+			do
+				pushd $EXT
+				echo "******** compiling perl extension $EXT ********"
+				yes "" | perl Makefile.PL PREFIX=/usr || exit 1
+				strip_debug
+				make install || exit 1
+				popd
+			done
+
 			exit 0
 		fi
 		;;
@@ -86,12 +91,27 @@
 			rm $WORKDIR/tmp/bin/perl || exit 1
 
 			# check here if install fails, you probably upgraded to a new perl release
-			PERLBIN=perl5.8.3
-			[ -e $WORKDIR/tmp/bin/$PERLBIN ] || exit 1
+			PERLBIN=perl5.8.4
+			if [ ! -e $WORKDIR/tmp/bin/$PERLBIN ]; then
+				echo "You need to edit the perl install script"
+				echo "every time you update to a new release"
+				exit 1
+			fi
 			ln -sf $PERLBIN $WORKDIR/tmp/bin/perl || exit 1
 
 			cp -dpR $WORKDIR/tmp/* $CDDIR/usr/ || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
+
+			# now let's take care of all the perl extension
+			cd $WORKDIR/perl-ext || exit 1
+
+			for EXT in $(ls -d *)
+			do
+				pushd $EXT
+				make install DESTDIR=$CDDIR
+				popd
+			done
+
 		fi
    		;;