Add support for LDFLAGS in packages.

New function env_ldflags_path
New variable ENV_LDFLAGS_PATH

14 files changed, 35 insertions, 1 deletions

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 {