X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=b8edf5f8321be078c363b178bb83132e7cc8b59e;hb=3faa2b5a452ac4d86604c31278ff87fbee00fd54;hp=8b14988e2b2d69964fcfa1dcd606f7c1c476d48d;hpb=2b86b5b69df77007ae7fd31fc1ae39361a1a9019;p=hvlinux.git

diff --git a/functions/main b/functions/main
index 8b14988..b8edf5f 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}"
@@ -850,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)
@@ -954,6 +924,9 @@ ipkg()
 
     ipkg_trap_end
 
+    # Make sure to update dynamic linker run-time bindings
+    ldconfig
+
     return $EXIT_SUCCESS
 }