Correction erreur dans l'affichage de la valeur de CXXFLAGS

[hvlinux.git] / functions / main

diff --git a/functions/main b/functions/main
index b02efa8..b8edf5f 100644 (file)
--- 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
@@ -576,7 +543,7 @@ hv_groupadd()
     done
 
     if ! cat /etc/group | egrep -q "^${groupname}:"; then
-        groupadd ${arguments}    
+        groupadd ${arguments}
     fi
 }
 
@@ -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}"
@@ -817,6 +784,8 @@ indicate_pkg_build_complete()
     local PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done
 
     ipkg_display_build_infos > ${PACKAGE_STATUS}
+    echo "Source size: " ${SOURCE_SIZE} >> ${PACKAGE_STATUS}
+    echo "Build  size: " ${BUILD_SIZE}  >> ${PACKAGE_STATUS}
     echo -n "Build time: " >> ${PACKAGE_STATUS}
     display_build_time >> ${PACKAGE_STATUS}
     echo -e "\n" >> ${PACKAGE_STATUS}
@@ -848,6 +817,9 @@ ipkg()
 
     local HVMAKE_ORIG=${HVMAKE}
 
+    # Make sure to get latest variables assignments (ex: pkg-config)
+    source /etc/profile
+
     while getopts "jl:m:s:" flag ;do
         case ${flag} in
             j)
@@ -906,12 +878,16 @@ ipkg()
 
     PACKAGE_LOG=${LFS_LOG_DIR}/${HVLABEL}.log
     PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done
+    PACKAGE_STATUS=${LFS_LOG_DIR}/${HVLABEL}.status
 
     # Checking if package was previously successfully installed
     if [ -f ${PACKAGE_DONE} ]; then
        return $EXIT_SUCCESS
     fi
 
+    # Create or empty status file
+    cp /dev/null ${PACKAGE_STATUS}
+
     # Displaying label
     MSGSTRING="Installing ${HVLABEL}"
     display_checkbox_msg ${MSGSTRING}
@@ -948,6 +924,9 @@ ipkg()
 
     ipkg_trap_end
 
+    # Make sure to update dynamic linker run-time bindings
+    ldconfig
+
     return $EXIT_SUCCESS
 }
 
@@ -999,12 +978,16 @@ rscr()
 
     PACKAGE_LOG=${LFS_LOG_DIR}/${HVLABEL}.log
     PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done
+    PACKAGE_STATUS=${LFS_LOG_DIR}/${HVLABEL}.status
 
     if [ "x${SCRMODE}" = "xonce" ]; then
         # Checking if package was previously successfully installed
         if [ -f ${PACKAGE_DONE} ]; then
            return $EXIT_SUCCESS
         fi
+
+        # Create or empty status file
+        cp /dev/null ${PACKAGE_STATUS}
     fi
 
     display_checkbox_msg ${MSGSTRING}
@@ -1012,7 +995,7 @@ rscr()
     ipkg_trap_setup
 
     echo "------------------------" 1>> ${LFS_LOG_FILE}
-    echo ${HVLABEL} 1>> ${LFS_LOG_FILE}
+    echo "Running script ${HVLABEL}" 1>> ${LFS_LOG_FILE}
 
     # Executing script
     ${SCRDIR}/${SCRIPT} ${SCRIPT_ARGS} 1>> ${PACKAGE_LOG} 2>&1
@@ -1024,7 +1007,7 @@ rscr()
     echo "Completed" 1>> ${LFS_LOG_FILE}
 
     if [ "x${SCRMODE}" = "xonce" ]; then
-        # Report successfull installation of the package.
+        # Report successfull installation of the script.
         indicate_pkg_build_complete ${HVLABEL}
     fi