From 54a27ef444fe68a47069bd9f51cf8cfb00c0182c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 Jan 2017 20:41:28 +0300 Subject: In packages move configure and cmake flags into variable CONFIGURE_FLAGS. --- packages/SDL.sh | 12 +++++++----- packages/SDL_image.sh | 4 +++- packages/SDL_mixer.sh | 6 ++++-- packages/SDL_net.sh | 4 +++- packages/SDL_ttf.sh | 2 +- packages/cppcheck.sh | 4 +++- packages/libxml2.sh | 4 +++- packages/qemu.sh | 20 +++++++++++--------- scripts/include/common.sh | 18 ++++++++++++++---- 9 files changed, 49 insertions(+), 25 deletions(-) diff --git a/packages/SDL.sh b/packages/SDL.sh index fc1fd9b..a502812 100755 --- a/packages/SDL.sh +++ b/packages/SDL.sh @@ -9,15 +9,17 @@ ENV_LD_LIBRARY_PATH="lib" ENV_PKG_CONFIG_PATH="lib/pkgconfig" ENV_MANPATH="share/man" -function package_build { - run_switch_branch - run_src_script ./autogen.sh - run_configure --disable-rpath --enable-sdl-dlopen --disable-loadso \ +CONFIGURE_FLAGS="--disable-rpath --enable-sdl-dlopen --disable-loadso \ --disable-video-ggi \ --disable-nas --disable-esd --disable-arts \ --disable-alsa-shared --disable-pulseaudio-shared \ --disable-x11-shared \ - --enable-video-directfb + --enable-video-directfb" + +function package_build { + run_switch_branch + run_src_script ./autogen.sh + run_configure run_make run_make_install diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh index 525bc94..c6ba568 100755 --- a/packages/SDL_image.sh +++ b/packages/SDL_image.sh @@ -7,10 +7,12 @@ DEFAULT_BRANCH="SDL-1.2" ENV_LD_LIBRARY_PATH="lib" ENV_PKG_CONFIG_PATH="lib/pkgconfig" +CONFIGURE_FLAGS="--disable-jpg-shared --disable-tif-shared --disable-png-shared --disable-webp-shared" + function package_build { run_switch_branch run_src_script ./autogen.sh - run_configure --disable-jpg-shared --disable-tif-shared --disable-png-shared --disable-webp-shared + run_configure run_make run_make_install diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh index 0db9f2b..061363d 100755 --- a/packages/SDL_mixer.sh +++ b/packages/SDL_mixer.sh @@ -7,11 +7,13 @@ DEFAULT_BRANCH="SDL-1.2" ENV_LD_LIBRARY_PATH="lib" ENV_PKG_CONFIG_PATH="lib/pkgconfig" +CONFIGURE_FLAGS="--disable-music-mp3 \ + --disable-music-mod-shared --disable-music-ogg-shared --disable-music-mp3-shared --disable-music-flac-shared --disable-music-fluidsynth-shared" + function package_build { run_switch_branch run_src_script ./autogen.sh - run_configure --disable-music-mp3 \ - --disable-music-mod-shared --disable-music-ogg-shared --disable-music-mp3-shared --disable-music-flac-shared --disable-music-fluidsynth-shared + run_configure run_make run_make_install diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh index f7af9f5..c4d9c21 100755 --- a/packages/SDL_net.sh +++ b/packages/SDL_net.sh @@ -7,10 +7,12 @@ DEFAULT_BRANCH="SDL-1.2" ENV_LD_LIBRARY_PATH="lib" ENV_PKG_CONFIG_PATH="lib/pkgconfig" +CONFIGURE_FLAGS="--disable-gui" + function package_build { run_switch_branch run_src_script ./autogen.sh - run_configure --disable-gui + run_configure run_make run_make_install diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh index c837db4..cde9ae3 100755 --- a/packages/SDL_ttf.sh +++ b/packages/SDL_ttf.sh @@ -10,7 +10,7 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig" function package_build { run_switch_branch run_src_script ./autogen.sh - run_configure --disable-gui + run_configure run_make run_make_install diff --git a/packages/cppcheck.sh b/packages/cppcheck.sh index 77de5f8..9b6bf93 100755 --- a/packages/cppcheck.sh +++ b/packages/cppcheck.sh @@ -4,10 +4,12 @@ SRCURL=https://github.com/danmar/cppcheck.git ENV_PATH="bin:share/CppCheck" +CONFIGURE_FLAGS="-DHAVE_RULES=ON" + function package_build { run_switch_branch - run_cmake -DHAVE_RULES=ON + run_cmake run_make run_make_install diff --git a/packages/libxml2.sh b/packages/libxml2.sh index 4b20964..c3df21e 100755 --- a/packages/libxml2.sh +++ b/packages/libxml2.sh @@ -7,11 +7,13 @@ ENV_LD_LIBRARY_PATH="lib" ENV_PKG_CONFIG_PATH="lib/pkgconfig" ENV_MANPATH="share/man" +CONFIGURE_FLAGS="--with-python-install-dir="${bindir}/lib/python"" + function package_build { run_switch_branch run_autoreconf -i - run_configure --with-python-install-dir="${bindir}/lib/python" + run_configure run_make run_make_install diff --git a/packages/qemu.sh b/packages/qemu.sh index 019cdc5..b35d559 100755 --- a/packages/qemu.sh +++ b/packages/qemu.sh @@ -5,17 +5,19 @@ SRCURL=git://git.qemu-project.org/qemu.git ENV_PATH="bin" ENV_MANPATH="share/man" +CONFIGURE_FLAGS="\ + --target-list=x86_64-linux-user,x86_64-softmmu \ + --disable-nettle \ + --enable-spice \ + --enable-vte \ + --audio-drv-list=sdl,alsa \ + --enable-virglrenderer \ + --enable-sdl \ + --with-sdlabi=2.0" + function package_build { run_switch_branch - run_configure \ - --target-list=x86_64-linux-user,x86_64-softmmu \ - --disable-nettle \ - --enable-spice \ - --enable-vte \ - --audio-drv-list=sdl,alsa \ - --enable-virglrenderer \ - --enable-sdl \ - --with-sdlabi=2.0 + run_configure run_make run_make_install diff --git a/scripts/include/common.sh b/scripts/include/common.sh index d4a7ec8..21f00f2 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -117,19 +117,29 @@ function run_enable_same_dir_build { } function run_configure { + flags="$*" + if [[ "${flags}" == "" ]]; then + flags="${CONFIGURE_FLAGS}" + fi cd "${builddir}" check_error $? - echo "configure --prefix=\"${bindir}\" $*" - "$srcdir"/configure --prefix="${bindir}" $* + echo "configure --prefix=\"${bindir}\" ${flags}" + "$srcdir"/configure --prefix="${bindir}" ${flags} check_error $? + unset flags } function run_cmake { + flags="$*" + if [[ "${flags}" == "" ]]; then + flags="${CONFIGURE_FLAGS}" + fi cd "${builddir}" check_error $? - echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" $*" - cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" $* + echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}" + cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags} check_error $? + unset flags } function run_make { -- cgit v1.2.3-60-g2f50