From a1807d94008cc932533dd7fff0f78bc8a27fdc66 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 Jan 2017 02:38:42 +0300 Subject: Replace in packages package_use function to ENV_* variables. Impliment default package_use function for use ENV_* variables. --- packages/SDL.sh | 12 +++++------- packages/SDL_gfx.sh | 8 +++----- packages/SDL_image.sh | 8 +++----- packages/SDL_mixer.sh | 8 +++----- packages/SDL_net.sh | 8 +++----- packages/SDL_ttf.sh | 8 +++----- packages/cmake.sh | 6 ++---- packages/cppcheck.sh | 7 ++----- packages/curl.sh | 14 +++++--------- packages/libpng.sh | 14 +++++--------- packages/libxml2.sh | 14 +++++--------- packages/manaplus.sh | 8 +++----- packages/physfs.sh | 12 ++++-------- packages/qemu.sh | 8 +++----- packages/virglrenderer.sh | 12 +++++------- packages/zlib.sh | 13 +++++-------- 16 files changed, 59 insertions(+), 101 deletions(-) (limited to 'packages') diff --git a/packages/SDL.sh b/packages/SDL.sh index 256fa5b..f1da105 100755 --- a/packages/SDL.sh +++ b/packages/SDL.sh @@ -3,6 +3,11 @@ SRCTYPE=hg SRCURL=http://hg.libsdl.org/SDL/ +ENV_PATH="bin" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_MANPATH="share/man" + function package_build { run_switch_branch SDL-1.2 run_src_script ./autogen.sh @@ -16,10 +21,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" - env_man "share/man" -} diff --git a/packages/SDL_gfx.sh b/packages/SDL_gfx.sh index 9a9fb0b..2cdfbb3 100755 --- a/packages/SDL_gfx.sh +++ b/packages/SDL_gfx.sh @@ -2,6 +2,9 @@ SRCURL=https://github.com/ferzkopp/SDL_gfx.git +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" + function package_build { run_switch_branch master run_src_script ./autogen.sh @@ -10,8 +13,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh index f44089d..1fd81d0 100755 --- a/packages/SDL_image.sh +++ b/packages/SDL_image.sh @@ -3,6 +3,9 @@ SRCTYPE=hg SRCURL=http://hg.libsdl.org/SDL_image/ +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" + function package_build { run_switch_branch SDL-1.2 run_src_script ./autogen.sh @@ -11,8 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh index e83ba0b..e49c7cf 100755 --- a/packages/SDL_mixer.sh +++ b/packages/SDL_mixer.sh @@ -3,6 +3,9 @@ SRCTYPE=hg SRCURL=http://hg.libsdl.org/SDL_mixer/ +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" + function package_build { run_switch_branch SDL-1.2 run_src_script ./autogen.sh @@ -12,8 +15,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh index 9fd3357..a535f8c 100755 --- a/packages/SDL_net.sh +++ b/packages/SDL_net.sh @@ -3,6 +3,9 @@ SRCTYPE=hg SRCURL=http://hg.libsdl.org/SDL_net/ +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" + function package_build { run_switch_branch SDL-1.2 run_src_script ./autogen.sh @@ -11,8 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh index 17e145b..42c881c 100755 --- a/packages/SDL_ttf.sh +++ b/packages/SDL_ttf.sh @@ -3,6 +3,9 @@ SRCTYPE=hg SRCURL=http://hg.libsdl.org/SDL_ttf/ +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" + function package_build { run_switch_branch SDL-1.2 run_src_script ./autogen.sh @@ -11,8 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/cmake.sh b/packages/cmake.sh index 44c6f3c..f94b528 100755 --- a/packages/cmake.sh +++ b/packages/cmake.sh @@ -2,6 +2,8 @@ SRCURL=git://cmake.org/cmake.git +ENV_PATH="bin" + function package_build { run_switch_branch master run_cmake @@ -9,7 +11,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" -} diff --git a/packages/cppcheck.sh b/packages/cppcheck.sh index 22de440..5087c95 100755 --- a/packages/cppcheck.sh +++ b/packages/cppcheck.sh @@ -2,6 +2,8 @@ SRCURL=https://github.com/danmar/cppcheck.git +ENV_PATH="bin:share/CppCheck" + function package_build { run_switch_branch master @@ -10,8 +12,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_path "share/CppCheck" -} diff --git a/packages/curl.sh b/packages/curl.sh index e92d673..6e3496c 100755 --- a/packages/curl.sh +++ b/packages/curl.sh @@ -2,6 +2,11 @@ SRCURL=https://github.com/curl/curl.git +ENV_PATH="bin:lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_MANPATH="share/man" + function package_build { run_switch_branch master @@ -14,12 +19,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_path "lib" - env_path "include" - env_man "share/man" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/libpng.sh b/packages/libpng.sh index ede0e17..bdeff84 100755 --- a/packages/libpng.sh +++ b/packages/libpng.sh @@ -2,6 +2,11 @@ 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_MANPATH="share/man" + function package_build { run_switch_branch master @@ -11,12 +16,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_path "lib" - env_path "include" - env_man "share/man" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/libxml2.sh b/packages/libxml2.sh index 7393475..84cb391 100755 --- a/packages/libxml2.sh +++ b/packages/libxml2.sh @@ -2,6 +2,11 @@ SRCURL=git://git.gnome.org/libxml2 +ENV_PATH="bin:lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_MANPATH="share/man" + function package_build { run_switch_branch master @@ -11,12 +16,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_path "lib" - env_path "include" - env_man "share/man" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/manaplus.sh b/packages/manaplus.sh index 414346a..f191af5 100755 --- a/packages/manaplus.sh +++ b/packages/manaplus.sh @@ -2,6 +2,9 @@ SRCURL=https://gitlab.com/manaplus/manaplus.git +ENV_PATH="bin" +ENV_MANPATH="share/man" + function package_build { run_switch_branch master @@ -11,8 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_man "share/man" -} diff --git a/packages/physfs.sh b/packages/physfs.sh index 8d9d43b..dacdbd6 100755 --- a/packages/physfs.sh +++ b/packages/physfs.sh @@ -3,6 +3,10 @@ SRCTYPE=hg SRCURL=https://hg.icculus.org/icculus/physfs/ +ENV_PATH="bin:lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" + function package_build { run_switch_branch stable-2.0 run_cmake @@ -10,11 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_path "lib" - env_path "include" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} diff --git a/packages/qemu.sh b/packages/qemu.sh index 27dff3e..d8369b5 100755 --- a/packages/qemu.sh +++ b/packages/qemu.sh @@ -2,6 +2,9 @@ SRCURL=git://git.qemu-project.org/qemu.git +ENV_PATH="bin" +ENV_MANPATH="share/man" + function package_build { run_switch_branch master run_configure \ @@ -21,8 +24,3 @@ function package_build { #function package_deps { # run_add_dep virglrenderer #} - -function package_use { - env_bin "bin" - env_man "share/man" -} diff --git a/packages/virglrenderer.sh b/packages/virglrenderer.sh index c3e5654..fc91a33 100755 --- a/packages/virglrenderer.sh +++ b/packages/virglrenderer.sh @@ -2,6 +2,11 @@ SRCURL=git://people.freedesktop.org/~airlied/virglrenderer +ENV_PATH="bin" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_MANPATH="share/man" + function package_build { run_switch_branch master run_autoreconf -v --install @@ -9,10 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "bin" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" - env_man "share/man" -} diff --git a/packages/zlib.sh b/packages/zlib.sh index 4ccef04..8e25f37 100755 --- a/packages/zlib.sh +++ b/packages/zlib.sh @@ -2,6 +2,11 @@ SRCURL=https://github.com/madler/zlib.git +ENV_PATH="bin:lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_MANPATH="share/man" + function package_build { run_switch_branch v1.2.11 run_configure @@ -9,11 +14,3 @@ function package_build { run_make run_make_install } - -function package_use { - env_path "lib" - env_path "include" - env_man "share/man" - env_lib_library_path "lib" - env_pkg_config_path "lib/pkgconfig" -} -- cgit v1.2.3-60-g2f50