From: root <root@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sun, 24 Jan 2010 19:15:25 +0000 (+0000)
Subject: Enlevé sqlite et gdbm du stage3 (sont installés au stage2)
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=367c87688d90070cc08ae585c0a827400cd351d7;p=hvlinux.git

Enlevé sqlite et gdbm du stage3 (sont installés au stage2)
---

diff --git a/packages-list b/packages-list
index 392cf71..6c427b2 100644
--- a/packages-list
+++ b/packages-list
@@ -87,7 +87,7 @@ FETCHMAIL="fetchmail-6.3.12"
 FFMPEG="ffmpeg-svn-20539"
 FILE_PKG="file-4.26"
 FINDUTILS="findutils-4.2.32"
-FIREFOX="firefox-3.5.5.source"
+FIREFOX="firefox-3.6.source"
 FLAC="flac-1.2.1"
 FLEX="flex-2.5.33"
 FONTCONFIG="fontconfig-2.4.2"
diff --git a/stage3/cis-tcl b/stage3/cis-tcl
deleted file mode 100755
index 6c8d8ef..0000000
--- a/stage3/cis-tcl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1} &&
-
-cd ${LFS_TMP}/${1} &&
-export VERSION=$(echo ${1} | sed "s!tcl\(.*\)!\1!g")
-export V=`echo $VERSION | cut -d "." -f 1,2` &&
-export DIR=$PWD &&
-cd unix &&
-sed -i "s/relid'/relid/" configure &&
-./configure \
-    --prefix=/usr \
-    --enable-threads &&
-make &&
-sed -i -e "s:${DIR}/unix:/usr/lib:" \
-    -e "s:${DIR}:/usr/include/tcl${V}:" \
-    -e "s:^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so':\
-TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\":" tclConfig.sh &&
-
-make install &&
-install -d /usr/include/tcl${V}/unix &&
-install -m644 *.h /usr/include/tcl${V}/unix/ &&
-install -d /usr/include/tcl${V}/generic &&
-install -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ &&
-rm -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h &&
-ln -nsf ../../include/tcl${V} /usr/lib/tcl${V}/include &&
-ln -sf libtcl${V}.so /usr/lib/libtcl.so &&
-ln -sf tclsh${V} /usr/bin/tclsh &&
-
-ldconfig
-
-# Return last error
-exit $?
diff --git a/stage3/packages-update b/stage3/packages-update
index be59577..649b69a 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -47,7 +47,6 @@ fpkg       ${WINDOWMAKER_EXTRA} "ftp://windowmaker.org/pub/source/release"
 fpkg_sf    ${LESSTIF}
 lpkg     2 ${EMACS}
 
-fpkg_mis   ${TCL} "${TCL}-src" ${SOURCEFORGE_URL}/tcl
 fpkg_mis   ${TK}  "${TK}-src"  ${SOURCEFORGE_URL}/tcl
 
 fpkg       ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
@@ -160,7 +159,6 @@ fpkg_gnome ${ESOUND}
 
 fpkg       ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
 fpkg       ${LIBOIL} "http://liboil.freedesktop.org/download"
-fpkg_gnu   ${GDBM}
 fpkg       ${SPEEX} "http://downloads.xiph.org/releases/speex"
 fpkg       ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio"
 
@@ -191,7 +189,6 @@ fpkg_hv    ${SWEEP}
 fpkg       ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
 fpkg       ${SYLPHEED} "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})"
 
-fpkg       ${SQLITE} "http://www.sqlite.org"
 fpkg_hv    ${NSS}
 fpkg       ${FIREFOX} "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
 
diff --git a/stage3/stage3-install b/stage3/stage3-install
index ee603cc..6ccf167 100755
--- a/stage3/stage3-install
+++ b/stage3/stage3-install
@@ -81,10 +81,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg     ${EMACS} cis-emacs
 fi
 
-ipkg     ${TCL} cis-tcl
 ipkg     ${TK}  cis-tk
 
-ipkg_ac ${SQLITE}
 ipkg_ac ${PYTHON} "--enable-shared"
 
 ipkg    ${LIBBOOST} cis-boost