x86_64 static build support

5 files changed, 45 insertions, 10 deletions

diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh
index 6a047023..89f2d1ca 100755
--- a/scripts/portable_build.sh
+++ b/scripts/portable_build.sh
@@ -1,14 +1,15 @@
 #!/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 
+AP=$ORIGIN/tools/apbuild
+export CC=$AP/apgcc
+export CXX=$AP/apgcc 
+
 export APBUILD_STATIC_LIBGCC=1
 
 ./autogen.sh
 
-./configure --enable-staticlink --enable-portable --disable-artwork-imlib2
+./configure --enable-staticlink=yes --enable-portable=yes --disable-artwork-imlib2
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
 make clean
 make -j9
diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh
index 9d00dd82..26fa6051 100755
--- a/scripts/portable_package_static.sh
+++ b/scripts/portable_package_static.sh
@@ -10,10 +10,12 @@ PLUGDIR=$SRCDIR/plugins
 DOCDIR=$SRCDIR/doc
 PIXMAPDIR=$SRCDIR/pixmaps
 
-rm portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2
+ARCH=`uname -m | perl -ne 'chomp and print'`
 
-cd portable
-tar jcvf ../portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2\
+rm portable_out/build/deadbeef-$VERSION-static-$ARCH.tar.bz2
+
+cd portable/$ARCH
+tar jcvf ../..//portable_out/build/deadbeef-$VERSION-static-$ARCH.tar.bz2\
     $SRCDIR/deadbeef\
     $SRCDIR/deadbeef.png\
     $DOCDIR\
@@ -58,7 +60,7 @@ tar jcvf ../portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2\
     $PLUGDIR/convpresets\
     $PLUGDIR/pulse.so\
     $PLUGDIR/dsp_libsrc.so\
-    $PLUGDIR/mono2stereo.so\
+    $PLUGDIR/ddb_mono2stereo.so\
     $PIXMAPDIR\
     $SRCDIR/locale
-cd ..
+cd ../..
diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh
index b68bade0..9a82c216 100755
--- a/scripts/portable_postbuild.sh
+++ b/scripts/portable_postbuild.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 OSTYPE=`uname -s`
-OUTDIR=portable/deadbeef-$VERSION
+ARCH=`uname -m | perl -ne 'chomp and print'`
+OUTDIR=portable/$ARCH/deadbeef-$VERSION
 PLUGDIR=$OUTDIR/plugins
 DOCDIR=$OUTDIR/doc
 PIXMAPDIR=$OUTDIR/pixmaps
diff --git a/scripts/static_build.sh b/scripts/static_build.sh
new file mode 100755
index 00000000..7eb00e10
--- /dev/null
+++ b/scripts/static_build.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
+ORIGIN=`pwd | perl -ne 'chomp and print'`
+AP=$ORIGIN/tools/apbuild
+export CC=$AP/apgcc
+export CXX=$AP/apgcc 
+
+export APBUILD_STATIC_LIBGCC=1
+
+./autogen.sh
+
+./configure --enable-staticlink --disable-artwork-imlib2 --prefix=/opt/deadbeef
+sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
+make clean
+make -j9
+
+#./scripts/portable_extraplugs.sh
+
+cd $ORIGIN
+
+echo "building pluginfo tool..."
+cd tools/pluginfo
+make
+cd ../../
+
+#./scripts/portable_postbuild.sh
+fakeroot -- ./scripts/static_install.sh
+
diff --git a/scripts/static_install.sh b/scripts/static_install.sh
new file mode 100755
index 00000000..9de33357
--- /dev/null
+++ b/scripts/static_install.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
+DESTDIR=`pwd`/static/deadbeef-$VERSION make install