You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2014/08/31 15:16:11 UTC
svn commit: r1621588 - in /httpd/httpd: branches/2.2.x/build/NWGNUtail.inc
branches/2.4.x/build/NWGNUtail.inc trunk/build/NWGNUtail.inc
Author: fuankg
Date: Sun Aug 31 13:16:11 2014
New Revision: 1621588
URL: http://svn.apache.org/r1621588
Log:
Fix NetWare build: set NLM version with commandline option
instead of linker def file due to bug with mwldnlm linker
where patch version > 26 is ignored from def file.
Modified:
httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
httpd/httpd/branches/2.4.x/build/NWGNUtail.inc
httpd/httpd/trunk/build/NWGNUtail.inc
Modified: httpd/httpd/branches/2.2.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUtail.inc?rev=1621588&r1=1621587&r2=1621588&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUtail.inc Sun Aug 31 13:16:11 2014
@@ -221,6 +221,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
$(call DEL,$@)
$(call DEL,$(@:.opt=.def))
@echo $(DL)GEN $@$(DL)
+ @echo $(DL)-nlmversion=$(NLM_VERSION)$(DL)>> $@
@echo $(DL)-warnings off$(DL)>> $@
@echo $(DL)-zerobss$(DL)>> $@
@echo $(DL)-o $(TARGET_nlm)$(DL)>> $@
@@ -284,7 +285,7 @@ endif
@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def)
@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def)
@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>> $(@:.opt=.def)
- @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
+# @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
ifneq "$(NLM_CHECK_SYM)" ""
Modified: httpd/httpd/branches/2.4.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/NWGNUtail.inc?rev=1621588&r1=1621587&r2=1621588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/2.4.x/build/NWGNUtail.inc Sun Aug 31 13:16:11 2014
@@ -221,6 +221,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
$(call DEL,$@)
$(call DEL,$(@:.opt=.def))
@echo $(DL)GEN $@$(DL)
+ @echo $(DL)-nlmversion=$(NLM_VERSION)$(DL)>> $@
@echo $(DL)-warnings off$(DL)>> $@
@echo $(DL)-zerobss$(DL)>> $@
@echo $(DL)-o $(TARGET_nlm)$(DL)>> $@
@@ -284,7 +285,7 @@ endif
@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def)
@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def)
@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>> $(@:.opt=.def)
- @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
+# @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
ifneq "$(NLM_CHECK_SYM)" ""
Modified: httpd/httpd/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUtail.inc?rev=1621588&r1=1621587&r2=1621588&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUtail.inc (original)
+++ httpd/httpd/trunk/build/NWGNUtail.inc Sun Aug 31 13:16:11 2014
@@ -221,6 +221,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
$(call DEL,$@)
$(call DEL,$(@:.opt=.def))
@echo $(DL)GEN $@$(DL)
+ @echo $(DL)-nlmversion=$(NLM_VERSION)$(DL)>> $@
@echo $(DL)-warnings off$(DL)>> $@
@echo $(DL)-zerobss$(DL)>> $@
@echo $(DL)-o $(TARGET_nlm)$(DL)>> $@
@@ -284,7 +285,7 @@ endif
@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def)
@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def)
@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>> $(@:.opt=.def)
- @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
+# @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
ifneq "$(NLM_CHECK_SYM)" ""