openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From truck...@apache.org
Subject svn commit: r1820587 - /openoffice/trunk/main/solenv/gbuild/Output.mk
Date Mon, 08 Jan 2018 17:12:58 GMT
Author: truckman
Date: Mon Jan  8 17:12:58 2018
New Revision: 1820587

URL: http://svn.apache.org/viewvc?rev=1820587&view=rev
Log:
Revert the part of r1818099 that changed the hardwired awk command
in main/solenv/gbuild/Output.mk with $(gb_AWK).  Unfortunately
$(gb_AWK) is not defined at this point, so this change caused
errors each time a gbuild makefile was invoked.  The definition
of $(gb_AWK) is in the platform gbuild files, which are included
after Output.mk.  Changing the order of the includes breaks the
Windows build due to other chicken vs. egg problems.  Fortunately
using hardwired awk works everywhere except Solaris, which we no
longer support.


Modified:
    openoffice/trunk/main/solenv/gbuild/Output.mk

Modified: openoffice/trunk/main/solenv/gbuild/Output.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Output.mk?rev=1820587&r1=1820586&r2=1820587&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Output.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Output.mk Mon Jan  8 17:12:58 2018
@@ -57,8 +57,11 @@ endif
 
 # disable for OS/2
 ifneq ($(OS),OS2)
-gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+# We can't use $(gb_AWK) here since that is defined in the platform files,
+# which are not included yet.  Reordering the includes causes other
+# problems.  Fortunately hardcoding awk works everywhere except Solaris.
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
 endif
 
 



Mime
View raw message