From f1855d38361f0c7c76e2bf063ed3243836afd1de Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 2 Feb 2017 18:26:28 +0300
Subject: Add support for ACLOCAL_PATH in packages.

New function env_aclocal_path
New variable ENV_ACLOCAL_PATH
---
 scripts/include/common.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'scripts/include/common.sh')

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 0df1bba..c61111f 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -78,6 +78,11 @@ 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 $?
@@ -249,6 +254,7 @@ function package_use {
     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_ACLOCAL_PATH" "ACLOCAL_PATH"
 }
 
 function common_use_package {
-- 
cgit v1.2.3-70-g09d2


From 31ce259791affb84bd1bfc81bf64cd69edc80d1e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 2 Feb 2017 23:46:27 +0300
Subject: Add support for LDFLAGS in packages.

New function env_ldflags_path
New variable ENV_LDFLAGS_PATH
---
 packages/SDL.sh           |  1 +
 packages/SDL_gfx.sh       |  1 +
 packages/SDL_image.sh     |  1 +
 packages/SDL_mixer.sh     |  1 +
 packages/SDL_net.sh       |  1 +
 packages/SDL_ttf.sh       |  1 +
 packages/curl.sh          |  1 +
 packages/libpng.sh        |  1 +
 packages/libxml2.sh       |  1 +
 packages/physfs.sh        |  1 +
 packages/virglrenderer.sh |  1 +
 packages/zlib.sh          |  1 +
 packages/zlib_ng.sh       |  1 +
 scripts/include/common.sh | 23 ++++++++++++++++++++++-
 14 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'scripts/include/common.sh')

diff --git a/packages/SDL.sh b/packages/SDL.sh
index 23de6f6..49583c5 100644
--- a/packages/SDL.sh
+++ b/packages/SDL.sh
@@ -5,6 +5,7 @@ DEFAULT_BRANCH="SDL-1.2"
 ENV_PATH="bin"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 ENV_ACLOCAL_PATH="share/aclocal"
 
diff --git a/packages/SDL_gfx.sh b/packages/SDL_gfx.sh
index f454041..af718de 100644
--- a/packages/SDL_gfx.sh
+++ b/packages/SDL_gfx.sh
@@ -3,6 +3,7 @@ DEFAULT_BRANCH="master"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh
index 0e8f8cc..9a9c255 100644
--- a/packages/SDL_image.sh
+++ b/packages/SDL_image.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh
index 7f53d17..44850f3 100644
--- a/packages/SDL_mixer.sh
+++ b/packages/SDL_mixer.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh
index 5b55d35..123d479 100644
--- a/packages/SDL_net.sh
+++ b/packages/SDL_net.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh
index 4e3696b..66d71b3 100644
--- a/packages/SDL_ttf.sh
+++ b/packages/SDL_ttf.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/curl.sh b/packages/curl.sh
index 58ba51e..812ac51 100644
--- a/packages/curl.sh
+++ b/packages/curl.sh
@@ -3,6 +3,7 @@ SRCURL=https://github.com/curl/curl.git
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 
 ENABLE_SAME_DIR_BUILD="true"
diff --git a/packages/libpng.sh b/packages/libpng.sh
index 9da9556..0ef8750 100644
--- a/packages/libpng.sh
+++ b/packages/libpng.sh
@@ -3,6 +3,7 @@ SRCURL=git://git.code.sf.net/p/libpng/code
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="automake"
diff --git a/packages/libxml2.sh b/packages/libxml2.sh
index 40be7d6..2001e19 100644
--- a/packages/libxml2.sh
+++ b/packages/libxml2.sh
@@ -3,6 +3,7 @@ SRCURL=git://git.gnome.org/libxml2
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 ENV_ACLOCAL_PATH="share/aclocal"
 
diff --git a/packages/physfs.sh b/packages/physfs.sh
index 9addbb0..fedb9de 100644
--- a/packages/physfs.sh
+++ b/packages/physfs.sh
@@ -5,5 +5,6 @@ DEFAULT_BRANCH="stable-2.0"
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 
 BUILD_TYPE="cmake"
diff --git a/packages/virglrenderer.sh b/packages/virglrenderer.sh
index 30eeabc..581e2cd 100644
--- a/packages/virglrenderer.sh
+++ b/packages/virglrenderer.sh
@@ -3,6 +3,7 @@ SRCURL=git://people.freedesktop.org/~airlied/virglrenderer
 ENV_PATH="bin"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="automake"
diff --git a/packages/zlib.sh b/packages/zlib.sh
index 5d30818..a95d832 100644
--- a/packages/zlib.sh
+++ b/packages/zlib.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="v1.2.11"
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 
 ENABLE_SAME_DIR_BUILD="true"
diff --git a/packages/zlib_ng.sh b/packages/zlib_ng.sh
index 49af866..04d1d71 100644
--- a/packages/zlib_ng.sh
+++ b/packages/zlib_ng.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="develop"
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 
 BUILD_TYPE="configure"
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index c61111f..3df470a 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -88,6 +88,11 @@ function env_lib_library_path {
     check_error $?
 }
 
+function env_ldflags_path {
+    echo "export LDFLAGS=${bindir}/$1 \$LDFLAGS" >>"${envfile}"
+    check_error $?
+}
+
 function env_pkg_config_path {
     echo "export PKG_CONFIG_PATH=${bindir}/$1:\$PKG_CONFIG_PATH" >>"${envfile}"
     check_error $?
@@ -244,7 +249,22 @@ function repack_paths {
         packedpaths="${packedpaths}${bindir}/$var:"
     done
     unset IFS
-    echo "export $2=${packedpaths}\$$2" >>"${envfile}"
+    echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
+    check_error $?
+}
+
+function repack_flags {
+    if [[ "$1" == "" ]]; then
+        return
+    fi
+    IFS=":"
+    packedpaths=""
+    for var in $1
+    do
+        packedpaths="${3}${packedpaths}${bindir}/$var "
+    done
+    unset IFS
+    echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
     check_error $?
 }
 
@@ -255,6 +275,7 @@ function package_use {
     repack_paths "$ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH"
     repack_paths "$ENV_MANPATH" "MANPATH"
     repack_paths "$ENV_ACLOCAL_PATH" "ACLOCAL_PATH"
+    repack_flags "$ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
 }
 
 function common_use_package {
-- 
cgit v1.2.3-70-g09d2


From 8dc0d6e175aeadb00def65f00f049445dabc738d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 3 Feb 2017 00:07:48 +0300
Subject: Add support for CPPFLAGS in packages.

New function env_cppflags_path
New variable ENV_CPPFLAGS_PATH
---
 packages/SDL.sh           | 1 +
 packages/SDL_gfx.sh       | 1 +
 packages/SDL_image.sh     | 1 +
 packages/SDL_mixer.sh     | 1 +
 packages/SDL_net.sh       | 1 +
 packages/SDL_ttf.sh       | 1 +
 packages/curl.sh          | 1 +
 packages/libpng.sh        | 1 +
 packages/libxml2.sh       | 1 +
 packages/physfs.sh        | 1 +
 packages/virglrenderer.sh | 1 +
 packages/zlib.sh          | 1 +
 packages/zlib_ng.sh       | 1 +
 scripts/include/common.sh | 8 +++++++-
 14 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'scripts/include/common.sh')

diff --git a/packages/SDL.sh b/packages/SDL.sh
index 49583c5..159562a 100644
--- a/packages/SDL.sh
+++ b/packages/SDL.sh
@@ -8,6 +8,7 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 ENV_ACLOCAL_PATH="share/aclocal"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_gfx.sh b/packages/SDL_gfx.sh
index af718de..7e51d60 100644
--- a/packages/SDL_gfx.sh
+++ b/packages/SDL_gfx.sh
@@ -4,6 +4,7 @@ DEFAULT_BRANCH="master"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh
index 9a9c255..22d2812 100644
--- a/packages/SDL_image.sh
+++ b/packages/SDL_image.sh
@@ -5,6 +5,7 @@ DEFAULT_BRANCH="SDL-1.2"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh
index 44850f3..42e0efc 100644
--- a/packages/SDL_mixer.sh
+++ b/packages/SDL_mixer.sh
@@ -5,6 +5,7 @@ DEFAULT_BRANCH="SDL-1.2"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh
index 123d479..524fa02 100644
--- a/packages/SDL_net.sh
+++ b/packages/SDL_net.sh
@@ -5,6 +5,7 @@ DEFAULT_BRANCH="SDL-1.2"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh
index 66d71b3..392f425 100644
--- a/packages/SDL_ttf.sh
+++ b/packages/SDL_ttf.sh
@@ -5,6 +5,7 @@ DEFAULT_BRANCH="SDL-1.2"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/curl.sh b/packages/curl.sh
index 812ac51..bc0c3a2 100644
--- a/packages/curl.sh
+++ b/packages/curl.sh
@@ -5,6 +5,7 @@ ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include"
 
 ENABLE_SAME_DIR_BUILD="true"
 
diff --git a/packages/libpng.sh b/packages/libpng.sh
index 0ef8750..b4695f7 100644
--- a/packages/libpng.sh
+++ b/packages/libpng.sh
@@ -5,5 +5,6 @@ ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+#ENV_CPPFLAGS_PATH="include/libpngXX"
 
 BUILD_TYPE="automake"
diff --git a/packages/libxml2.sh b/packages/libxml2.sh
index 2001e19..894e58b 100644
--- a/packages/libxml2.sh
+++ b/packages/libxml2.sh
@@ -6,6 +6,7 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
 ENV_ACLOCAL_PATH="share/aclocal"
+ENV_CPPFLAGS_PATH="include/libxml2"
 
 BUILD_TYPE="automake"
 CONFIGURE_FLAGS="--with-python-install-dir="${bindir}/lib/python""
diff --git a/packages/physfs.sh b/packages/physfs.sh
index fedb9de..8bf51f6 100644
--- a/packages/physfs.sh
+++ b/packages/physfs.sh
@@ -6,5 +6,6 @@ ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include"
 
 BUILD_TYPE="cmake"
diff --git a/packages/virglrenderer.sh b/packages/virglrenderer.sh
index 581e2cd..8c87c5b 100644
--- a/packages/virglrenderer.sh
+++ b/packages/virglrenderer.sh
@@ -5,6 +5,7 @@ ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include:include/virgl"
 
 BUILD_TYPE="automake"
 AUTORECONF_FLAGS="-v --install"
diff --git a/packages/zlib.sh b/packages/zlib.sh
index a95d832..d3e4ade 100644
--- a/packages/zlib.sh
+++ b/packages/zlib.sh
@@ -6,6 +6,7 @@ ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include"
 
 ENABLE_SAME_DIR_BUILD="true"
 
diff --git a/packages/zlib_ng.sh b/packages/zlib_ng.sh
index 04d1d71..ad426ac 100644
--- a/packages/zlib_ng.sh
+++ b/packages/zlib_ng.sh
@@ -6,5 +6,6 @@ ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include"
 
 BUILD_TYPE="configure"
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 3df470a..d57879b 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -93,6 +93,11 @@ function env_ldflags_path {
     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 $?
@@ -261,7 +266,7 @@ function repack_flags {
     packedpaths=""
     for var in $1
     do
-        packedpaths="${3}${packedpaths}${bindir}/$var "
+        packedpaths="${packedpaths}${3}${bindir}/$var "
     done
     unset IFS
     echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
@@ -276,6 +281,7 @@ function package_use {
     repack_paths "$ENV_MANPATH" "MANPATH"
     repack_paths "$ENV_ACLOCAL_PATH" "ACLOCAL_PATH"
     repack_flags "$ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
+    repack_flags "$ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
 }
 
 function common_use_package {
-- 
cgit v1.2.3-70-g09d2


From b6c965589911ab9ef671d692612b0df9cf97b1fb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 3 Feb 2017 21:38:19 +0300
Subject: Add support for script variables for override package path variabled.

New variables: OVERRIDE_ENV_NAME
Example: OVERRIDE_ENV_MANPATH="/dir"
---
 scripts/include/common.sh | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'scripts/include/common.sh')

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index d57879b..6c2a7e7 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -244,44 +244,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 {
-    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}${3}${bindir}/$var "
+        packedpaths="${packedpaths}${4}${bindir}/$var "
     done
     unset IFS
-    echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
+    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_ACLOCAL_PATH" "ACLOCAL_PATH"
-    repack_flags "$ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
-    repack_flags "$ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
+    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 {
-- 
cgit v1.2.3-70-g09d2


From 6471091f99c78563e785f8740dcab0dc87825ee4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 3 Feb 2017 21:46:19 +0300
Subject: Add support for include command in packages. for include other
 package definition.

---
 scripts/include/common.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts/include/common.sh')

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 6c2a7e7..e54922b 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -368,3 +368,7 @@ function package_build {
     run_make
     run_make_install
 }
+
+function include {
+    source "./$1.sh"
+}
-- 
cgit v1.2.3-70-g09d2


From cbb68a99b5c02c5601fb9e6c135d1b4e7764068d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 17 Feb 2017 14:40:31 +0300
Subject: Add support for environment variable jobs.

It set jobs number for make.
If jobs unset, it autodetected based on number of cpu cores.
---
 scripts/include/common.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'scripts/include/common.sh')

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index e54922b..e348e5d 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -165,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 {
-- 
cgit v1.2.3-70-g09d2


From 4f66c6c7df447be0a2bfc404c2371ef206a8fdc9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 17 Feb 2017 19:08:28 +0300
Subject: Add script for create environment file from more than one package.

New script name: createenvs.sh envname package1 [package2 ...]
Example: ./createenvs.sh sdl1 SDL SDL_image SDL_ttf SDL_net SDL_gfx SDL_mixer
---
 scripts/createenvs.sh     |  5 +++++
 scripts/include/common.sh | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100755 scripts/createenvs.sh

(limited to 'scripts/include/common.sh')

diff --git a/scripts/createenvs.sh b/scripts/createenvs.sh
new file mode 100755
index 0000000..a5fba23
--- /dev/null
+++ b/scripts/createenvs.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../scripts/include/common.sh
+
+common_use_packages $*
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index e348e5d..e7e8f8c 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -317,6 +317,43 @@ 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 package_get_source {
     echo "package_get_source"
     run_clone "${SRCURL}"
-- 
cgit v1.2.3-70-g09d2


From 3b5049928a6c82ce72f99cf07ef40499f027160d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 19 Feb 2017 03:15:27 +0300
Subject: Add script for update all downloaded sources.

New script: updatesrcall.sh
---
 scripts/include/common.sh | 13 +++++++++++++
 scripts/updatesrcall.sh   |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100755 scripts/updatesrcall.sh

(limited to 'scripts/include/common.sh')

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index e7e8f8c..382f8a5 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -354,6 +354,19 @@ function common_use_packages {
     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}"
diff --git a/scripts/updatesrcall.sh b/scripts/updatesrcall.sh
new file mode 100755
index 0000000..6f42573
--- /dev/null
+++ b/scripts/updatesrcall.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../scripts/include/common.sh
+
+common_update_source_all
-- 
cgit v1.2.3-70-g09d2