Skip to contentSkip to conversation

samba: fix dependencies

PATCH New Sven Neumann 2 participants 5 messages Sep 21, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 samba: fix dependencies

The samba configure scripts detects the presence of fam and avahi headers in order to decide whether support for fam and/or avahi should be built into samba. This patch adds the missing dependencies so that fam and/or avahi are built before samba if they are selected in buildroot.

---
 package/samba/samba.mk |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
package/samba/samba.mk +18 -1
index 7a5e7b1..2c344a1 100644
@@ -11,6 +11,8 @@ SAMBA_CAT:=$(ZCAT)
 SAMBA_BINARY:=bin/smbd
 SAMBA_TARGET_BINARY:=usr/sbin/smbd
 
+SAMBA_DEPENDENCIES=libiconv
+
 ifeq ($(BR2_PACKAGE_SAMBA_LIBSMBCLIENT),y)
 SAMBA_LIBSMBCLIENT := libsmbclient
 SAMBA_CONF_OPTIONS := --enable-libsmbclient
@@ -19,6 +21,21 @@ SAMBA_LIBSMBCLIENT :=
 SAMBA_CONF_OPTIONS := --disable-libsmbclient
 endif
 
+ifeq ($(BR2_PACKAGE_AVAHI),y)
+SAMBA_CONF_OPTIONS := --enable-avahi
+SAMBA_DEPENDENCIES += avahi
+else
+SAMBA_CONF_OPTIONS := --disable-avahi
+endif
+
+ifeq ($(BR2_PACKAGE_GAMIN),y)
+SAMBA_CONF_OPTIONS := --enable-fam
+SAMBA_DEPENDENCIES += gamin
+else
+SAMBA_CONF_OPTIONS := --disable-fam
+endif
+
+
 $(DL_DIR)/$(SAMBA_SOURCE):
 	$(call DOWNLOAD,$(SAMBA_SITE),$(SAMBA_SOURCE))
 
@@ -146,7 +163,7 @@ libsmbclient: $(SAMBA_DIR)/bin/libsmbclient.so
 		DESTDIR="$(STAGING_DIR)" \
 		-C $(SAMBA_DIR) installlibs
 
-samba: libiconv $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) $(SAMBA_LIBSMBCLIENT)
+samba: $(SAMBA_DEPENDENCIES) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) $(SAMBA_LIBSMBCLIENT)
 
 samba-source: $(DL_DIR)/$(SAMBA_SOURCE)
 
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 samba: fix dependencies

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> The samba configure scripts detects the presence of fam and avahi Sven> headers in order to decide whether support for fam and/or avahi should Sven> be built into samba. This patch adds the missing dependencies so that Sven> fam and/or avahi are built before samba if they are selected in buildroot.

Thanks, but it doesn't apply (which is slightly odd as your patches are the only thing changing samba.mk in 2009). Could you recreate against git please?

git am -3 -s /tmp/samba.patch
Applying: samba: fix dependencies
error: patch failed: package/samba/samba.mk:11
error: package/samba/samba.mk: patch does not apply
fatal: sha1 information is lacking or useless (package/samba/samba.mk). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001 samba: fix dependencies
When you have resolved this problem run "git am -3 --resolved". If you would prefer to skip this patch, instead run "git am -3 --skip". To restore the original branch and stop patching run "git am -3 --abort"

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 samba: fix dependencies

Quoted 10 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> The samba configure scripts detects the presence of fam and avahi Sven> headers in order to decide whether support for fam and/or avahi should Sven> be built into samba. This patch adds the missing dependencies so that Sven> fam and/or avahi are built before samba if they are selected in buildroot.

Thanks, but it doesn't apply (which is slightly odd as your patches are the only thing changing samba.mk in 2009). Could you recreate against git please?

Well, there is still the patch attached to bug #301 and I have that applied in our branch. I will merge the patch to the master branch and resend it...

Sven

#3 lore raw

PATCH 1/1 samba: fix dependencies

The samba configure scripts detects the presence of fam and avahi headers in order to decide whether support for fam and/or avahi should be built into samba. This patch adds the missing dependencies so that fam and/or avahi are built before samba if they are selected in buildroot.

---
 package/samba/samba.mk |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
package/samba/samba.mk +17 -1
index 45e9938..84620c1 100644
@@ -11,6 +11,22 @@ SAMBA_CAT:=$(ZCAT)
 SAMBA_BINARY:=bin/smbd
 SAMBA_TARGET_BINARY:=usr/sbin/smbd
 
+SAMBA_DEPENDENCIES=libiconv
+
+ifeq ($(BR2_PACKAGE_AVAHI),y)
+SAMBA_CONF_OPTIONS := --enable-avahi
+SAMBA_DEPENDENCIES += avahi
+else
+SAMBA_CONF_OPTIONS := --disable-avahi
+endif
+
+ifeq ($(BR2_PACKAGE_GAMIN),y)
+SAMBA_CONF_OPTIONS := --enable-fam
+SAMBA_DEPENDENCIES += gamin
+else
+SAMBA_CONF_OPTIONS := --disable-fam
+endif
+
 $(DL_DIR)/$(SAMBA_SOURCE):
 	$(call DOWNLOAD,$(SAMBA_SITE),$(SAMBA_SOURCE))
 
@@ -133,7 +149,7 @@ endif
 	rm -rf $(TARGET_DIR)/var/cache/samba
 	rm -rf $(TARGET_DIR)/var/lib/samba
 
-samba: libiconv $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
+samba: $(SAMBA_DEPENDENCIES) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
 
 samba-source: $(DL_DIR)/$(SAMBA_SOURCE)
 
Signature · 1 line
1.6.4.3
#4 lore raw

PATCH 1/1 samba: fix dependencies

In reply to Sven Neumann
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Quoted 2 lines · Peter Korsgaard
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> The samba configure scripts detects the presence of fam and avahi Sven> headers in order to decide whether support for fam and/or avahi should Sven> be built into samba. This patch adds the missing dependencies so that Sven> fam and/or avahi are built before samba if they are selected in buildroot.

Quoted 4 lines
Quoted 4 lines

Thanks, but it doesn't apply (which is slightly odd as your patches are the only thing changing samba.mk in 2009). Could you recreate against git please?

Sven> Well, there is still the patch attached to bug #301 and I have that Sven> applied in our branch. I will merge the patch to the master branch and Sven> resend it...

Ahh yes. I just took a look at #301, and I just now noticed that the 2nd make installlibs had DESTDIR set to staging rather than target, so now it all makes sense to me ;)

I'll commit #301 and this one shortly - Sorry for the slow response.

Signature · 1 line
Bye, Peter Korsgaard