From de947d2bee49e01abde37ab9d32d7c018c1f98b0 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Thu, 22 Mar 2012 20:42:41 +0000
Subject: [PATCH] Allows to build Python and openssl before libxml2 and
 subversion respectively in BLFS tools, avoiding later recompilation

---
 Config.in                     | 22 +++++++++++++++++++---
 common/libs/func_install_blfs | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/Config.in b/Config.in
index b9e1b53..db7b519 100644
--- a/Config.in
+++ b/Config.in
@@ -583,7 +583,7 @@ menu "--- BOOK Settings"
 
 		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,8 +594,24 @@ menu "--- BOOK Settings"
 		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
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index a447153..85b38a7 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -79,13 +79,25 @@ if [ "$DEP_SVN" = y ]; then
 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 @@ fi
 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