]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix NetWare build: set NLM version with commandline option
authorGuenter Knauf <fuankg@apache.org>
Sun, 31 Aug 2014 13:16:11 +0000 (13:16 +0000)
committerGuenter Knauf <fuankg@apache.org>
Sun, 31 Aug 2014 13:16:11 +0000 (13:16 +0000)
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/branches/2.2.x@1621588 13f79535-47bb-0310-9956-ffa450edef68

build/NWGNUtail.inc

index 0e4fd8d0f7e4889140aa84fcedd742de898a20e8..d6d3070b2ca6f8a88bf9d04d57b8baf0167c7d09 100644 (file)
@@ -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)" ""