1 files changed, 114 insertions, 9 deletions

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 0df1bba..382f8a5 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -78,11 +78,26 @@ function env_path {
     check_error $?
 }
 
+function env_aclocal_path {
+    echo "export ACLOCAL_PATH=${bindir}/$1:\$PATH" >>"${envfile}"
+    check_error $?
+}
+
 function env_lib_library_path {
     echo "export LD_LIBRARY_PATH=${bindir}/$1:\$LD_LIBRARY_PATH" >>"${envfile}"
     check_error $?
 }
 
+function env_ldflags_path {
+    echo "export LDFLAGS=${bindir}/$1 \$LDFLAGS" >>"${envfile}"
+    check_error $?
+}
+
+function env_cppflags_path {
+    echo "export CPPFLAGS=${bindir}/$1 \$CPPFLAGS" >>"${envfile}"
+    check_error $?
+}
+
 function env_pkg_config_path {
     echo "export PKG_CONFIG_PATH=${bindir}/$1:\$PKG_CONFIG_PATH" >>"${envfile}"
     check_error $?
@@ -150,9 +165,19 @@ function run_cmake {
 }
 
 function run_make {
-    echo "make"
-    make
+    if [[ "${jobs}" == "" ]]; then
+        if [ -f "/proc/cpuinfo" ]; then
+            jobs="$(cat /proc/cpuinfo|grep processor|wc -l)"
+        else
+            jobs="1"
+        fi
+    fi
+    j=" -j${jobs}"
+
+    echo "make$j"
+    make$j
     check_error $?
+    unset j
 }
 
 function run_make_install {
@@ -229,26 +254,52 @@ function run_switch_branch {
 }
 
 function repack_paths {
-    if [[ "$1" == "" ]]; then
+    envvar="$1"
+    if [[ "$2" != "" ]]; then
+        envvar="$2"
+    fi
+    if [[ "$envvar" == "" ]]; then
         return
     fi
     IFS=":"
     packedpaths=""
-    for var in $1
+    for var in $envvar
     do
         packedpaths="${packedpaths}${bindir}/$var:"
     done
     unset IFS
-    echo "export $2=${packedpaths}\$$2" >>"${envfile}"
+    echo "export $3=\"${packedpaths}\$$3\"" >>"${envfile}"
+    check_error $?
+}
+
+function repack_flags {
+    envvar="$1"
+    if [[ "$2" != "" ]]; then
+        envvar="$2"
+    fi
+    if [[ "$envvar" == "" ]]; then
+        return
+    fi
+    IFS=":"
+    packedpaths=""
+    for var in $envvar
+    do
+        packedpaths="${packedpaths}${4}${bindir}/$var "
+    done
+    unset IFS
+    echo "export $3=\"${packedpaths}\$$3\"" >>"${envfile}"
     check_error $?
 }
 
 function package_use {
     echo "package_use"
-    repack_paths "$ENV_PATH" "PATH"
-    repack_paths "$ENV_LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
-    repack_paths "$ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH"
-    repack_paths "$ENV_MANPATH" "MANPATH"
+    repack_paths "$ENV_PATH" "$OVERRIDE_ENV_PATH" "PATH"
+    repack_paths "$ENV_LD_LIBRARY_PATH" "$OVERRIDE_ENV_LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
+    repack_paths "$ENV_PKG_CONFIG_PATH" "$OVERRIDE_ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH"
+    repack_paths "$ENV_MANPATH" "$OVERRIDE_ENV_MANPATH" "MANPATH"
+    repack_paths "$ENV_ACLOCAL_PATH" "$OVERRIDE_ENV_ACLOCAL_PATH" "ACLOCAL_PATH"
+    repack_flags "$ENV_LDFLAGS_PATH" "$OVERRIDE_ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
+    repack_flags "$ENV_CPPFLAGS_PATH" "$OVERRIDE_ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
 }
 
 function common_use_package {
@@ -266,6 +317,56 @@ function common_use_package {
     check_error $?
 }
 
+function common_use_packages {
+    cd "${scriptsdir}"
+    check_error $?
+
+    export envname="$1"
+    export installname0="${installname}"
+    export envfile="../env/run${envname}.sh"
+    echo "#!/bin/bash" >"${envfile}"
+    check_error $?
+    echo "" >>"${envfile}"
+    shift
+    names="$*"
+    IFS=" "
+    for package in $names
+    do
+        export installname="${installname0}"
+        unset ENV_PATH
+        unset ENV_LD_LIBRARY_PATH
+        unset ENV_PKG_CONFIG_PATH
+        unset ENV_MANPATH
+        unset ENV_ACLOCAL_PATH
+        unset ENV_LDFLAGS_PATH
+        unset ENV_CPPFLAGS_PATH
+
+        common_package_init
+        common_build_init
+        common_run_package
+        package_use
+        check_error $?
+    done
+    unset IFS
+    echo "\$*" >>"${envfile}"
+    check_error $?
+    chmod 0755 "${envfile}"
+    check_error $?
+}
+
+function common_update_source_all {
+    cd ../src/
+    check_error $?
+    files="*"
+    for package in $files
+    do
+        cd ../scripts/
+        ./updatesrc.sh $package
+        check_error $?
+    done
+    unset files
+}
+
 function package_get_source {
     echo "package_get_source"
     run_clone "${SRCURL}"
@@ -327,3 +428,7 @@ function package_build {
     run_make
     run_make_install
 }
+
+function include {
+    source "./$1.sh"
+}