r3609 - in jhalfs/branches/ablfs: . common/libs

pierre at linuxfromscratch.org pierre at linuxfromscratch.org
Thu Mar 22 13:42:46 PDT 2012


Author: pierre
Date: 2012-03-22 14:42:41 -0600 (Thu, 22 Mar 2012)
New Revision: 3609

Modified:
   jhalfs/branches/ablfs/Config.in
   jhalfs/branches/ablfs/common/libs/func_install_blfs
Log:
Allows to build Python and openssl before libxml2 and subversion respectively
in BLFS tools, avoiding later recompilation

Modified: jhalfs/branches/ablfs/Config.in
===================================================================
--- jhalfs/branches/ablfs/Config.in	2012-03-22 20:40:04 UTC (rev 3608)
+++ jhalfs/branches/ablfs/Config.in	2012-03-22 20:42:41 UTC (rev 3609)
@@ -583,7 +583,7 @@
 
 		config	DEP_GPM
 		bool	"GPM (optional, see help)"
-		default	y
+		default	n
 		help
 			#-- if you install gpm, it will be started
 			#   automatically on boot. You'll have to edit
@@ -594,9 +594,25 @@
 		default	n
 		help
 			#-- Subversion is needed for updating the book
-			#   sources. It is built without ssl support,
-			#   so you may have to rebuild it afterwards.
+			#   sources. If you want ssl support, select
+			#   OPENSSL below.
 
+		config	DEP_OPENSSL
+		bool	"OPENSSL (optional, see help)"
+		default	n
+		help
+			#-- selecting OPENSSL here allows to build
+			#   subversion with ssl support, avoiding a later
+			#   recompilation
+
+		config	DEP_PYTHON
+		bool	"PYTHON 2 (optional, see help)"
+		default	n
+		help
+			#-- selecting PYTHON 2 here allows to build
+			#   the libxml2 and libxslt python modules,
+			#   avoiding a later recompilation
+
 	endmenu
 	#--- End blfs-tool Support
 

Modified: jhalfs/branches/ablfs/common/libs/func_install_blfs
===================================================================
--- jhalfs/branches/ablfs/common/libs/func_install_blfs	2012-03-22 20:40:04 UTC (rev 3608)
+++ jhalfs/branches/ablfs/common/libs/func_install_blfs	2012-03-22 20:42:41 UTC (rev 3609)
@@ -79,13 +79,25 @@
 else
   LINE_SVN='#CONFIG_subversion is not set'
 fi
+if [ "$DEP_OPENSSL" = y ]; then
+  LINE_OPENSSL='CONFIG_openssl=y'
+else
+  LINE_OPENSSL='#CONFIG_openssl is not set'
+fi
+if [ "$DEP_PYTHON" = y ]; then
+  LINE_PYTHON='CONFIG_python2=y'
+else
+  LINE_PYTHON='#CONFIG_python2 is not set'
+fi
 
 cat >$BUILDDIR$BLFS_ROOT/configuration <<EOF
+$LINE_PYTHON
 $LINE_LIBXML
 $LINE_LIBXSLT
 $LINE_WGET
 $LINE_TIDY
 $LINE_DBXML
+$LINE_OPENSSL
 $LINE_SVN
 $LINE_GPM
 $LINE_LYNX
@@ -130,6 +142,12 @@
 if [ "$DEP_SVN" = y ]; then
   sed -i -e /javahl/d -e /swig/d $BUILDDIR$BLFS_ROOT/scripts/*subversion
 fi
+if [ "$DEP_PYTHON" = y ]; then
+  sed -i -e '/^make.*Doc/d' -e '/^chmod/{n;N;d}' $BUILDDIR$BLFS_ROOT/scripts/*python2
+fi
+if [ "$DEP_OPENSSL" = y ]; then
+  sed -i 's/^make$/make -j1/' $BUILDDIR$BLFS_ROOT/scripts/*openssl
+fi
 
 # At last generates the build Makefile
 mkdir -p $BUILDDIR$BLFS_ROOT/work




More information about the alfs-log mailing list