Allows to build Python and openssl before libxml2 and subversion respectively

in BLFS tools, avoiding later recompilation
This commit is contained in:
Pierre Labastie 2012-03-22 20:42:41 +00:00
parent cd668b9315
commit de947d2bee
2 changed files with 37 additions and 3 deletions

View file

@ -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

View file

@ -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