22316904 add samba to do-not-publish list for evaluation builds
authorJohn Beck <John.Beck@Oracle.COM>
Sat, 05 Dec 2015 08:44:07 -0800
changeset 5176 6ed69e0ee716
parent 5175 c63cda9960d4
child 5177 eb02f7b13b81
22316904 add samba to do-not-publish list for evaluation builds
components/samba/samba/Makefile
components/samba/samba36/Makefile
--- a/components/samba/samba/Makefile	Wed Dec 09 09:15:22 2015 -0800
+++ b/components/samba/samba/Makefile	Sat Dec 05 08:44:07 2015 -0800
@@ -62,6 +62,10 @@
 BUILD_DIR_SMB		= $(BUILD_DIR)/samba
 BUILD_DIR_WINB		= $(BUILD_DIR)/winbind
 
+# Depends on S12-only libraries from Desktop to build.
+ifeq ($(BUILD_TYPE), evaluation)
+PUBLISH_STAMP=
+endif
 include $(WS_MAKE_RULES)/ips.mk
 
 # directory to search for "include" in samba.p5m
@@ -211,6 +215,15 @@
 		waf configure $(WAFOPT1) $(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS.$(BITS)) )
 	$(TOUCH) [email protected]
 
+# Depends on S12-only libraries from Desktop to build.
+ifeq ($(BUILD_TYPE), evaluation)
+$(BUILD_DIR_SMB)/.built:
+$(BUILD_DIR_SMB)/.installed:
+$(BUILD_DIR_WINB)/.built:
+$(BUILD_DIR_WINB)/.installed:
+PUBLISH_STAMP=
+else
+
 # Build of Samba + Winbind.
 $(BUILD_DIR_SMB)/.built:	$(BUILD_DIR_SMB)/.configured
 	(cd $(@D) ; $(ENV) $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf build $(WAFOPT1) )
@@ -257,6 +270,7 @@
 	    $(INSTALL) -m 0555 -t $(PROTO_DIR)/usr/lib/samba/private$(MACHLIBDIR) bin/shared/private/*.so* \
 	"
 	$(TOUCH) [email protected]
+endif
 
 # Set appropriate bitnesses for Samba + Winbind / Winbind (without Samba).
 $(BUILD_DIR_SMB)/.configured:	BITS=64
--- a/components/samba/samba36/Makefile	Wed Dec 09 09:15:22 2015 -0800
+++ b/components/samba/samba36/Makefile	Sat Dec 05 08:44:07 2015 -0800
@@ -54,6 +54,14 @@
 BUILD_DIR_64 = $(BUILD_DIR)/$(MACH64)/$(SRC_OFFSET)
 
 include $(WS_MAKE_RULES)/configure.mk
+
+# Depends on Samba 4 which has S12-only dependencies.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
 include $(WS_MAKE_RULES)/ips.mk
 
 # dirs to search for "include" in samba.p5m