From: Guenter Knauf Date: Sun, 31 Aug 2014 13:16:11 +0000 (+0000) Subject: Fix NetWare build: set NLM version with commandline option X-Git-Tag: 2.5.0-alpha~3855 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=266da2feb27a5be9d1c201e8720a53a83fcbadb0;p=apache 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621588 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 7f13b94fe7..718c62c084 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -221,6 +221,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS) $(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)" ""