diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-08 23:12:15 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-08 23:12:15 +0100 |
| commit | 32a11747dd6849867b0bb934d6a7e89b496ee230 (patch) | |
| tree | 81d1a5785e35d5151ff545a1bfd8b5d9018d6b12 /scripts | |
| parent | e6a466562dd3356781ffc6381abccebb26440246 (diff) | |
take static build dependencies from static-deps folder, instead of ../deadbeef-deps
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/portable_extraplugs.sh | 19 | ||||
| -rwxr-xr-x | scripts/static_build.sh | 17 |
2 files changed, 9 insertions, 27 deletions
diff --git a/scripts/portable_extraplugs.sh b/scripts/portable_extraplugs.sh deleted file mode 100755 index 982ec15d..00000000 --- a/scripts/portable_extraplugs.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` -ORIGIN=`pwd | perl -ne 'chomp and print'` -AP=$HOME/bin/autopackage -export CC=$AP/apbuild/apgcc -export CXX=$AP/apbuild/apgcc -export APBUILD_STATIC_LIBGCC=1 - -ZLIB_LIBS="$ORIGIN/../deadbeef-deps/lib-x86-32/lib/libz.a" -CFLAGS="-I$ORIGIN/../deadbeef-deps/lib-x86-32/include" - -for i in shn dumb ao ; do - echo cd - cd $ORIGIN/plugins/$i - make clean - echo making $ORIGIN/plugins/$i - make -j8 STATIC_CFLAGS="$CFLAGS" CC=$CC CXX=$CXX ZLIB_LIBS=$ZLIB_LIBS -done - diff --git a/scripts/static_build.sh b/scripts/static_build.sh index 87183589..e7763a53 100755 --- a/scripts/static_build.sh +++ b/scripts/static_build.sh @@ -1,21 +1,22 @@ #!/bin/bash VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'` ORIGIN=`pwd | perl -ne 'chomp and print'` +STATIC_DEPS=static-deps AP=$ORIGIN/tools/apbuild #ARCH=`uname -m | perl -ne 'chomp and print'` if [[ "$ARCH" == "i686" ]]; then - export CFLAGS="-m32 -I$ORIGIN/../deadbeef-deps/lib-x86-32/include/i386-linux-gnu" + export CFLAGS="-m32 -I$ORIGIN/$STATIC_DEPS/lib-x86-32/include/i386-linux-gnu" export CXXFLAGS=$CFLAGS - export LDFLAGS="-m32 -L$ORIGIN/../deadbeef-deps/lib-x86-32/lib -L$ORIGIN/../deadbeef-deps/lib-x86-32/lib/i386-linux-gnu" + export LDFLAGS="-m32 -L$ORIGIN/$STATIC_DEPS/lib-x86-32/lib -L$ORIGIN/$STATIC_DEPS/lib-x86-32/lib/i386-linux-gnu" export CONFIGURE_FLAGS="--build=i686-unknown-linux-gnu" - export LD_LIBRARY_PATH="$ORIGIN/../deadbeef-deps/lib-x86-32/lib" - export PKG_CONFIG_PATH="$ORIGIN/../deadbeef-deps/lib-x86-32/lib/pkgconfig" + export LD_LIBRARY_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-32/lib" + export PKG_CONFIG_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-32/lib/pkgconfig" elif [[ "$ARCH" == "x86_64" ]]; then - export CFLAGS='-m64 -I$ORIGIN/../deadbeef-deps/lib-x86-64/include/x86_64-linux-gnu' - export LDFLAGS="-m64 -L$ORIGIN/../deadbeef-deps/lib-x86-64/lib -L$ORIGIN/../deadbeef-deps/lib-x86-64/lib/x86_64-linux-gnu" + export CFLAGS="-m64 -I$ORIGIN/$STATIC_DEPS/lib-x86-64/include/x86_64-linux-gnu" + export LDFLAGS="-m64 -L$ORIGIN/$STATIC_DEPS/lib-x86-64/lib -L$ORIGIN/$STATIC_DEPS/lib-x86-64/lib/x86_64-linux-gnu" export CONFIGURE_FLAGS="--build=x86_64-unknown-linux-gnu" - export LD_LIBRARY_PATH="$ORIGIN/../deadbeef-deps/lib-x86-64/lib" - export PKG_CONFIG_PATH="$ORIGIN/../deadbeef-deps/lib-x86-64/lib/pkgconfig" + export LD_LIBRARY_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-64/lib" + export PKG_CONFIG_PATH="$ORIGIN/$STATIC_DEPS/lib-x86-64/lib/pkgconfig" else echo unknown arch $ARCH exit -1 |