svn commit: r1621593 - /apr/apr/trunk/build/NWGNUtail.inc

[fu...@apache.org]

Author: fuankg
Date: Sun Aug 31 13:50:02 2014
New Revision: 1621593

URL: http://svn.apache.org/r1621593
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:
    apr/apr/trunk/build/NWGNUtail.inc

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1621593&r1=1621592&r2=1621593&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Aug 31 13:50:02 2014
@@ -253,6 +253,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
 ifeq "$(findstring mwldnlm,$(LINK))" "mwldnlm" # for Metrowerks CodeWarrior
 	@echo $(DL)# Do not edit this file - it is created by make!$(DL) > $@
 	@echo $(DL)# All your changes will be lost!!$(DL)>> $@
+	@echo $(DL)-nlmversion=$(NLM_VERSION)$(DL)>> $@
 	@echo $(DL)-warnings off$(DL)>> $@
 	@echo $(DL)-zerobss$(DL)>> $@
 	@echo $(DL)-nodefaults$(DL)>> $@
@@ -310,11 +311,9 @@ endif
 	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $@
 	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $@
 	@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>> $@
-	@echo $(DL)version $(NLM_VERSION) $(DL)>> $@
 	@echo $(DL)$(strip $(NLM_FLAGS))$(DL)>> $@
 	@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $@
 	@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $@
-#	@echo $(DL)map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@
 ifneq "$(NLM_CHECK_SYM)" ""
 	@echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $@
 endif
@@ -334,6 +333,7 @@ endif
 ifneq "$(NLM_XDCDATA)" ""
 	@echo $(DL)xdcdata $(notdir $(NLM_XDCDATA))$(DL)>> $@
 endif
+	@echo $(DL)map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@
 else # for GNU nlmconv
 ifneq "$(FILES_nlm_Ximports)" ""
 	@echo $(DL)import $(strip $(FILES_nlm_Ximports))$(DL)>> $@
@@ -354,6 +354,7 @@ endif
 ifeq "$(RELEASE)" "debug"
 	@echo $(DL)debug$(DL)>> $@
 endif
+	@echo $(DL)version $(NLM_VERSION) $(DL)>> $@
 endif
 
 else # more than one target so look for individual makefiles.