openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1840342 - /openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
Date Sat, 08 Sep 2018 08:13:11 GMT
Author: damjan
Date: Sat Sep  8 08:13:10 2018
New Revision: 1840342

URL: http://svn.apache.org/viewvc?rev=1840342&view=rev
Log:
Strip carriage returns from the Bison source files.

This hasn't been necessary so far, but dmake did it, so let's be safe.

Patch by: me


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

Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1840342&r1=1840341&r2=1840342&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Sat Sep  8 08:13:10 2018
@@ -617,7 +617,8 @@ endif
 
 $(call gb_BisonTarget_get_target,$(1),$(2)) : $(call gb_BisonTarget_get_source,$(2))
 	mkdir -p $(dir $(call gb_BisonTarget_get_target,$(1),$(2))) && \
-	bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(call gb_BisonTarget_get_source,$(2))

+	tr -d "\015" < $(call gb_BisonTarget_get_source,$(2)) > $(dir $(call gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir
$(call gb_BisonTarget_get_source,$(2))) && \
+	bison -d -o $(call gb_BisonTarget_get_target,$(1),$(2)) $(dir $(call gb_BisonTarget_get_target,$(1),$(2)))/stripped_$(notdir
$(call gb_BisonTarget_get_source,$(2)))
 
 endef
 



Mime
View raw message