[Lunar-commits] <moonbase> samba: fix build break when talloc installed

Zbigniew Luszpinski zbiggy at lunar-linux.org
Sun Mar 20 23:32:11 CET 2011


commit 04769a20274d1de3330fd659efe6a9f0930cf03c
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Mar 20 23:32:11 2011 +0100

    samba: fix build break when talloc installed
---
 net/samba/BUILD      |    7 +++++++
 net/samba/POST_BUILD |    6 ++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/net/samba/BUILD b/net/samba/BUILD
index 99cc639..965669c 100644
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -1,4 +1,11 @@
 (
+
+  # Samba build will break if talloc is installed
+  if module_installed talloc; then
+    lrm talloc
+    export TALLOC=installed
+  fi &&
+
   unset WITH_PAM &&
   if module_installed Linux-PAM; then
     WITH_PAM="--with-pam --with-pam_smbpass"
diff --git a/net/samba/POST_BUILD b/net/samba/POST_BUILD
index 0fdf826..d471ad3 100644
--- a/net/samba/POST_BUILD
+++ b/net/samba/POST_BUILD
@@ -2,3 +2,9 @@
 if [ ! -d /etc/samba/private ]; then
    install -d -m700 /etc/samba/private
 fi
+
+# Reinstall talloc after samba build
+if [ "$TALLOC" = 'installed' ]; then
+   lin talloc
+fi
+unset TALLOC


More information about the Lunar-commits mailing list