Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
18110535 samba/samba fails to build if ISA set in environment
authorVladimir Marek <Vladimir.Marek@oracle.com>
Wed, 10 Aug 2016 05:20:19 -0700
changeset 6612 ab085eee934a
parent 6611 e7359a340cbf
child 6613 7a9aec6e5daf
18110535 samba/samba fails to build if ISA set in environment
components/samba/Makefile file | annotate | diff | comparison | revisions 
--- a/components/samba/Makefile	Fri Aug 12 19:28:11 2016 -0700
+++ b/components/samba/Makefile	Wed Aug 10 05:20:19 2016 -0700
@@ -176,12 +176,12 @@
 	# Clone SOURCE_DIR
 	$(CLONEY) $(SOURCE_DIR) $(@D)
 	# clenup of clone
-	(cd $(@D) ; $(ENV) $(WAF_PATH) waf distclean $(WAFOPT1) )
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) waf distclean $(WAFOPT1) )
 	$(TOUCH) $@
 
 # Configure of Samba + Winbind.
 $(BUILD_DIR_SMB)/.configured: $(BUILD_DIR_SMB)/.BDprep
-	(cd $(@D) ; $(ENV) $(WAF_PATH) $(CONFIGURE_ENV) $(CONFIGURE_ENV.$(BITS)) \
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) $(CONFIGURE_ENV) $(CONFIGURE_ENV.$(BITS)) \
 		waf configure $(WAFOPT1) $(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS.$(BITS)) )
 	$(TOUCH) $@
 
@@ -196,12 +196,12 @@
 
 # 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) )
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf build $(WAFOPT1) )
 	$(TOUCH) $@
 
 # Install of Samba + Winbind.
 $(BUILD_DIR_SMB)/.installed:	$(BUILD_DIR_SMB)/.built
-	(cd $(@D) ; $(ENV) $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf install $(WAFOPT1) --destdir=$(PROTO_DIR) )
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf install $(WAFOPT1) --destdir=$(PROTO_DIR) )
 	$(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)/
 	$(TOUCH) $@
 
@@ -212,19 +212,19 @@
 	# Clone SOURCE_DIR
 	$(CLONEY) $(SOURCE_DIR) $(@D)
 	# clenup of clone
-	(cd $(@D) ; $(ENV) $(WAF_PATH) waf distclean $(WAFOPT1) )
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) waf distclean $(WAFOPT1) )
 	$(TOUCH) $@
 
 # Configure of Winbind (without Samba) for different bitness.
 $(BUILD_DIR_WINB)/.configured: $(BUILD_DIR_WINB)/.BDprep
-	(cd $(@D) ; $(ENV) $(WAF_PATH) $(CONFIGURE_ENV) $(CONFIGURE_ENV.$(BITS)) \
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) $(CONFIGURE_ENV) $(CONFIGURE_ENV.$(BITS)) \
 		waf configure $(WAFOPT1) $(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS.$(BITS)) )
 	$(TOUCH) $@
 
 # Build of Winbind (without Samba) for different bitness.
 WB_TARGETS =	--targets=nss_winbind,pamwinbind
 $(BUILD_DIR_WINB)/.built:	$(BUILD_DIR_WINB)/.configured
-	(cd $(@D) ; $(ENV) $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf build $(WAFOPT1) \
+	(cd $(@D) ; $(ENV) - $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf build $(WAFOPT1) \
 	    $(WB_TARGETS) )
 	$(TOUCH) $@
upstream/oracle/userland-gate