From 97af26f6ec21f3c2bdbb14aa070dffdd7f3dac2d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 23 May 2012 06:18:44 +0200
Subject: [PATCH] samba: build as static library, disable debug support, build
 without sqlite support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc-frodo/build |  1 +
 packages/mediacenter/xbmc-pvr/build   |  1 +
 packages/mediacenter/xbmc-rpi/build   |  1 +
 packages/mediacenter/xbmc/build       |  1 +
 packages/network/samba/build          | 30 +++++++++++----------------
 packages/network/samba/install        |  3 ---
 packages/network/samba/meta           |  4 ++--
 7 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/packages/mediacenter/xbmc-frodo/build b/packages/mediacenter/xbmc-frodo/build
index 7f60f5c39e..51ac701ed1 100755
--- a/packages/mediacenter/xbmc-frodo/build
+++ b/packages/mediacenter/xbmc-frodo/build
@@ -157,6 +157,7 @@ fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
+  export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build
index 1cf98f5aec..57b361ceb7 100755
--- a/packages/mediacenter/xbmc-pvr/build
+++ b/packages/mediacenter/xbmc-pvr/build
@@ -130,6 +130,7 @@ fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
+  export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/mediacenter/xbmc-rpi/build b/packages/mediacenter/xbmc-rpi/build
index 6d89227656..f3e7f72477 100755
--- a/packages/mediacenter/xbmc-rpi/build
+++ b/packages/mediacenter/xbmc-rpi/build
@@ -148,6 +148,7 @@ fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
+  export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 1cf98f5aec..57b361ceb7 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -130,6 +130,7 @@ fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
+  export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/network/samba/build b/packages/network/samba/build
index 6ae1ef9875..7af48423a3 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -40,9 +40,9 @@ sh autogen.sh
             --sysconfdir=/etc \
             --with-configdir=/etc/samba \
             --with-privatedir=/var/run \
-            --enable-shared \
-            --disable-static \
-            --enable-debug \
+            --disable-shared \
+            --enable-static \
+            --disable-debug \
             --disable-krb5developer \
             --disable-picky-developer \
             --enable-largefile \
@@ -51,9 +51,9 @@ sh autogen.sh
             --disable-swat \
             --disable-cups \
             --disable-iprint \
-            --enable-pie \
-            --enable-relro \
-            --enable-shared-libs \
+            --disable-pie \
+            --disable-relro \
+            --disable-shared-libs \
             --disable-external-libtalloc \
             --disable-external-libtdb \
             --disable-fam \
@@ -64,9 +64,9 @@ sh autogen.sh
             --disable-netapi \
             --disable-dmalloc \
             --with-fhs \
-            --without-libtalloc \
-            --without-libtdb \
-            --without-libnetapi \
+            --with-libtalloc \
+            --with-libtdb \
+            --with-libnetapi \
             --with-libsmbclient \
             --with-libsmbsharemodes \
             --without-libaddns \
@@ -98,20 +98,14 @@ sh autogen.sh
             --with-included-popt \
             --with-included-iniparser \
             --with-libiconv="$SYSROOT_PREFIX/usr" \
-            --with-sqlite3 \
+            --without-sqlite3 \
             --with-pthreads \
             --without-setproctitle \
 
-make bin/libsmbclient.so
-
-if [ "$SAMBA_SERVER" = yes ]; then
-  make bin/smbd
-  make bin/nmbd
-  make bin/smbpasswd
-fi
+make
 
 mkdir -p $SYSROOT_PREFIX/usr/lib
-  cp -P bin/*.so* $SYSROOT_PREFIX/usr/lib
+  cp -P bin/*.a $SYSROOT_PREFIX/usr/lib
 
 mkdir -p $SYSROOT_PREFIX/usr/include
   cp include/libsmbclient.h $SYSROOT_PREFIX/usr/include
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 6ada467ad9..9c747b6084 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -22,9 +22,6 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/source3/bin/*.so* $INSTALL/usr/lib
-
 if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 4a84b74dc5..f3bfd2012e 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.samba.org"
 PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="$ICONV sqlite connman"
-PKG_BUILD_DEPENDS="toolchain $ICONV sqlite"
+PKG_DEPENDS="$ICONV connman"
+PKG_BUILD_DEPENDS="toolchain $ICONV"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client"