X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=ec0e91143155309607c9c8687ed3505062cdbee2;hb=46a6cd65aaf72c044223fa7c33a28d6e99fa1f20;hp=6fcafdf4ebe56c9021ff9ef875a3b6eeafce9a8c;hpb=76be003fe4ca3d35a009b560d59bebbe438346c2;p=hvlinux.git

diff --git a/functions/main b/functions/main
index 6fcafdf..ec0e911 100644
--- a/functions/main
+++ b/functions/main
@@ -75,8 +75,6 @@ TAR_OPTS="-b8"
 # List of default archive extensions to try
 DEFAULT_ARCH_EXT_LIST="tar.bz2 tar.gz tgz tar.Z tar.xz zip"
 
-HV_FONTS_PATH="/usr/share/fonts"
-
 DEFAULT_IPKG_SCRIPT="ipkg.def"
 
 HVMAKE="make -j ${MAKEJOBS}"
@@ -232,37 +230,6 @@ get_pkg_name()
     echo ${1} | sed "s!\([^-][^0-9]*\)-[0-9].*!\1!"
 }
 
-# Saves the content of CFLAGS and CXXFLAGS environment variables.
-save_flags()
-{
-    export OLDCFLAGS=${CFLAGS}
-    export OLDCXXFLAGS=${CXXFLAGS}
-
-    return ${EXIT_SUCCESS}
-}
-
-# Saves the content of CFLAGS and CXXFLAGS environment variables, and then
-# set them to empty strings.
-save_flags_no_optimizations()
-{
-    export OLDCFLAGS=${CFLAGS}
-    export OLDCXXFLAGS=${CXXFLAGS}
-    export CFLAGS=""
-    export CXXFLAGS=""
-
-    return ${EXIT_SUCCESS}
-}
-
-# Restores the previous values of CFLAGS and CXXFLAGS environment variables. These
-# must have been saved first using save_flags().
-restore_flags()
-{
-    export CFLAGS=${OLDCFLAGS}
-    export CXXFLAGS=${OLDCXXFLAGS}
-
-    return ${EXIT_SUCCESS}
-}
-
 # Create symbolic links for start/stop scripts in /etc/rc.d
 #
 # Arg #1: script name
@@ -786,7 +753,7 @@ ipkg_display_build_infos()
     echo "  BUILD64:  ${BUILD64}"
     echo "  CFLAGS:   ${CFLAGS}"
     echo "  CPPFLAGS: ${CPPFLAGS}"
-    echo "  CXXFLAGS: ${CFLAGS}"
+    echo "  CXXFLAGS: ${CXXFLAGS}"
     echo "  LDFLAGS:  ${LDFLAGS}"
     echo "  RANLIB:   ${RANLIB}"
     echo "  CC:       ${CC}"
@@ -829,6 +796,7 @@ indicate_pkg_build_complete()
 # Arg. #1: Package name and version (ex: gcc-4.5.1)
 # Remaining arguments: Additional configure options
 # Options:
+#   -c     Do not decompress package to ${LFS_TMP}
 #   -j     Disable parallel make for this package
 #   -l     Unique identification label in 'install.log'
 #          (default is package name and version)
@@ -845,18 +813,21 @@ ipkg()
     START_TIME=$(echo `date +%s`)
 
     unset ALT_SCRIPT_NAME
+
+    export DECOMPRESS="1"
     export IPKG_MODE="ac" # Default mode if not specified
     export HVLABEL="" # Global variable
 
     local HVMAKE_ORIG=${HVMAKE}
 
-    # Make sure to get latest variables assignments (ex: pkg-config)
-    source /etc/profile
-
-    while getopts "jl:m:s:" flag ;do
+    while getopts "cjl:m:s:" flag ;do
         case ${flag} in
+            c)
+                # Do not decompress package
+                DECOMPRESS="0"
+                ;;
             j)
-                # Disable parallel make onlyfor this package
+                # Disable parallel make only for this package
                 HVMAKE="make"
                 ;;
 	    l)
@@ -944,6 +915,12 @@ ipkg()
     # Make sure we are at a known location
     cd ${SCRDIR}
 
+    if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then
+	# Make sure to update dynamic linker run-time bindings, except for
+	# stages 0 and 1 where we run as the LFS user.
+	ldconfig
+    fi
+
     exec 1>&6 # Restore stdout.
 
     # Displaying build time after the package name.
@@ -957,9 +934,6 @@ ipkg()
 
     ipkg_trap_end
 
-    # Make sure to update dynamic linker run-time bindings
-    ldconfig
-
     return $EXIT_SUCCESS
 }