Changeset de947d2

Timestamp:

03/22/2012 08:42:41 PM (13 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

dcb29a9

Parents:

cd668b9

Message:

Allows to build Python and openssl before libxml2 and subversion respectively
in BLFS tools, avoiding later recompilation

Files:

• Config.in (modified) (2 diffs)
• common/libs/func_install_blfs (modified) (3 diffs)

Config.in

@@ -584 +584 @@
                 config  DEP_GPM
                 bool    "GPM (optional, see help)"
-                default y
+                default n
                 help
                         #-- if you install gpm, it will be started
@@ -595 +595 @@
                 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

common/libs/func_install_blfs

@@ -80 +80 @@
   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
@@ -87 +98 @@
 $LINE_TIDY
 $LINE_DBXML
+$LINE_OPENSSL
 $LINE_SVN
 $LINE_GPM
@@ -131 +143 @@
   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