Attachment 372886 Details for Bug 199212 – Patch

[patch] Patch

bug-199212-20190625175238.patch (text/plain), 1.77 KB, created by Kenneth Russell on 2019-06-25 17:52:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kenneth Russell

Created: 2019-06-25 17:52:39 PDT

Size: 1.77 KB

patch

obsolete

>Subversion Revision: 246821
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index 53e972de434ca83df370629c8d49a6744cd28a65..5728c035badc1211f9fb177c4d259aa39c807106 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-25  Kenneth Russell  <kbr@chromium.org>
>+
>+        Script which adjusts include paths in ANGLE's copied headers breaks incremental builds
>+        https://bugs.webkit.org/show_bug.cgi?id=199212
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Maintain and test a timestamp in adjust-angle-include-paths.sh
>+        in order to avoid touching the headers during each build.
>+
>+	* adjust-angle-include-paths.sh:
>+
> 2019-06-18  Kenneth Russell  <kbr@chromium.org>
> 
>         Add preliminary ANGLE backend to WebCore
>diff --git a/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh b/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh
>index 4d50ef0fc09c42c4fa4be000086535a375ae8928..dc1d965bdc3c6740d96860f77a08c0930918744a 100755
>--- a/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh
>+++ b/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh
>@@ -28,7 +28,8 @@ else
> fi
> 
> for i in $output_dir/*.h ; do
>-    sed -e '
>+    if [ ! -f $output_dir/angle.timestamp ] || [ $i -nt $output_dir/angle.timestamp ] ; then
>+        sed -e '
> s/^#include <EGL\/$.*$>/#include <ANGLE\/\1>/
> s/^#include <GLES2\/$.*$>/#include <ANGLE\/\1>/
> s/^#include <GLES3\/$.*$>/#include <ANGLE\/\1>/
>@@ -36,4 +37,8 @@ s/^#include <KHR\/$.*$>/#include <ANGLE\/\1>/
> s/^#include <export.h>/#include <ANGLE\/export.h>/
> s/^#include "$eglext_angle\|gl2ext_angle\|ShaderVars$.h"/#include <ANGLE\/\1.h>/
> ' -i "" $i
>+        echo Postprocessed ANGLE header $i
>+    fi
> done
>+
>+touch $output_dir/angle.timestamp

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199212: 372886