components/bash/patches/solaris-002.Makefile.in.3.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Thu, 26 Jan 2017 12:24:45 +0100
branchs11u3-sru
changeset 7627 4758b76d5ad5
parent 115 c360825c3a3f
permissions -rw-r--r--
25123965 Update bash to version 4.4 24689447 problem in UTILITY/BASH 21341453 process hangs when terminated with unfinished command 21196056 bash test is failing to finish 19394218 bash : Parameter Substitution Causing Memory Leak

# Our compiler flags contain percent sign which get mixed up with percent sign
# seprators used by sed.
#
# Submitted to [email protected]

--- Makefile.in	2016-12-06 14:52:25.890038489 +0100
+++ Makefile.in	2016-12-06 14:52:15.493002959 +0100
@@ -584,10 +584,11 @@ $(Program):  .build $(OBJECTS) $(BUILTIN
 	@echo
 
 bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
-	@sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
-	     -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
-	     -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
-	     -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
+	@s=$$(printf '\001'); \
+	sed -e "s$${s}!MACHINE!$${s}$(Machine)$${s}" -e "s$${s}!OS!$${s}$(OS)$${s}" \
+	    -e "s$${s}!CFLAGS!$${s}$(CCFLAGS)$${s}" -e "s$${s}!CC!$${s}$(CC)$${s}" \
+	    -e "s$${s}!RELEASE!$${s}$(Version)$${s}" -e "s$${s}!PATCHLEVEL!$${s}$(PatchLevel)$${s}" \
+	    -e "s$${s}!MACHTYPE!$${s}$(MACHTYPE)$${s}" -e "s$${s}!RELSTATUS!$${s}$(RELSTATUS)$${s}" \
 	     $(SUPPORT_SRC)bashbug.sh > $@
 	@chmod a+rx bashbug