Attachment 454009 Details for Bug 237542 – Patch

[patch] Patch

237542.patch (text/plain), 2.21 KB, created by Michael Saboff on 2022-03-07 12:04:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Saboff

Created: 2022-03-07 12:04:47 PST

Size: 2.21 KB

patch

obsolete

>Index: Source/WebGPU/ChangeLog
>===================================================================
>--- Source/WebGPU/ChangeLog	(revision 290900)
>+++ Source/WebGPU/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2022-03-07  Michael Saboff  <msaboff@apple.com>
>+
>+        Catalyst build failure in WebGPU when building with SYSTEM_CONTENT_PATH
>+        https://bugs.webkit.org/show_bug.cgi?id=237542
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Updated create-symlink-to-altroot.sh to create the directory containing the output if is doesn't
>+        exist in lieu of specifying an output file in the build step.
>+        This is the way that other projects are configured.
>+
>+        * Scripts/create-symlink-to-altroot.sh:
>+        * WebGPU.xcodeproj/project.pbxproj:
>+
> 2022-03-06  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WebGPU] Use C++ references instead of pointers where applicable
>Index: Source/WebGPU/Scripts/create-symlink-to-altroot.sh
>===================================================================
>--- Source/WebGPU/Scripts/create-symlink-to-altroot.sh	(revision 290900)
>+++ Source/WebGPU/Scripts/create-symlink-to-altroot.sh	(working copy)
>@@ -1,4 +1,4 @@
>-#!/bin/zsh
>+#!/bin/sh
> 
> set -e
> 
>@@ -13,6 +13,12 @@ fi
> # Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
> RELATIVE_PATH_FROM_SYMLINK_TO_ROOT=$(echo "${ALTERNATE_ROOT_PATH}" | sed -E -e "s/\/[a-zA-Z0-9_]+/..\//g" -e "s/\/$//")
> SYMLINK_VALUE="${RELATIVE_PATH_FROM_SYMLINK_TO_ROOT}${INSTALL_PATH}/${FULL_PRODUCT_NAME}"
>+
>+OUTPUT_ALTERNATE_ROOT_DIR=`dirname ${OUTPUT_ALTERNATE_ROOT_PATH}`
>+
>+if [[ ! -d ${OUTPUT_ALTERNATE_ROOT_DIR} ]]; then
>+    mkdir -p ${OUTPUT_ALTERNATE_ROOT_DIR}
>+fi
> 
> if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
>     EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
>Index: Source/WebGPU/WebGPU.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebGPU/WebGPU.xcodeproj/project.pbxproj	(revision 290900)
>+++ Source/WebGPU/WebGPU.xcodeproj/project.pbxproj	(working copy)
>@@ -561,7 +561,6 @@
> 			outputFileListPaths = (
> 			);
> 			outputPaths = (
>-				"${OUTPUT_ALTERNATE_ROOT_PATH}",
> 			);
> 			runOnlyForDeploymentPostprocessing = 1;
> 			shellPath = /bin/zsh;

Flags:

saam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 237542: 454009