Title: [291460] branches/safari-614.1.6-branch/Source
Revision
291460
Author
repst...@apple.com
Date
2022-03-17 18:26:31 -0700 (Thu, 17 Mar 2022)

Log Message

Cherry-pick r291455. rdar://problem/90449608

    libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
    https://bugs.webkit.org/show_bug.cgi?id=238058

    Reviewed by Mark Lam.

    Source/ThirdParty/ANGLE:

    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
    We want to allow executables to use the framework via the symlink from the old location.

    * Configurations/ANGLE-dynamic.xcconfig:

    Source/ThirdParty/libwebrtc:

    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
    We want to allow executables to use the framework via the symlink from the old location.

    * Configurations/libwebrtc.xcconfig:

    Source/WebGPU:

    We need to set  DYLIB_INSTALL_NAME_BASE for WK_USE_ALTERNATE_FRAMEWORKS_DIR installs without the
    system content path prefix.
    We want to allow executables to use the framework via the symlink from the old location.

    * Configurations/WebGPU.xcconfig:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-614.1.6-branch/Source/ThirdParty/ANGLE/ChangeLog (291459 => 291460)


--- branches/safari-614.1.6-branch/Source/ThirdParty/ANGLE/ChangeLog	2022-03-18 01:19:24 UTC (rev 291459)
+++ branches/safari-614.1.6-branch/Source/ThirdParty/ANGLE/ChangeLog	2022-03-18 01:26:31 UTC (rev 291460)
@@ -1,3 +1,49 @@
+2022-03-17  Russell Epstein  <repst...@apple.com>
+
+        Cherry-pick r291455. rdar://problem/90449608
+
+    libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
+    https://bugs.webkit.org/show_bug.cgi?id=238058
+    
+    Reviewed by Mark Lam.
+    
+    Source/ThirdParty/ANGLE:
+    
+    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/ANGLE-dynamic.xcconfig:
+    
+    Source/ThirdParty/libwebrtc:
+    
+    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/libwebrtc.xcconfig:
+    
+    Source/WebGPU:
+    
+    We need to set  DYLIB_INSTALL_NAME_BASE for WK_USE_ALTERNATE_FRAMEWORKS_DIR installs without the
+    system content path prefix.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/WebGPU.xcconfig:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-17  Michael Saboff  <msab...@apple.com>
+
+            libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
+            https://bugs.webkit.org/show_bug.cgi?id=238058
+
+            Reviewed by Mark Lam.
+
+            We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+            We want to allow executables to use the framework via the symlink from the old location.
+
+            * Configurations/ANGLE-dynamic.xcconfig:
+
 2022-03-12  Tim Horton  <timothy_hor...@apple.com>
 
         Adopt FALLBACK_PLATFORM_NAME in place of FALLBACK_PLATFORM

Modified: branches/safari-614.1.6-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (291459 => 291460)


--- branches/safari-614.1.6-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2022-03-18 01:19:24 UTC (rev 291459)
+++ branches/safari-614.1.6-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2022-03-18 01:26:31 UTC (rev 291460)
@@ -30,6 +30,7 @@
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
 
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
 DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;

Modified: branches/safari-614.1.6-branch/Source/ThirdParty/libwebrtc/ChangeLog (291459 => 291460)


--- branches/safari-614.1.6-branch/Source/ThirdParty/libwebrtc/ChangeLog	2022-03-18 01:19:24 UTC (rev 291459)
+++ branches/safari-614.1.6-branch/Source/ThirdParty/libwebrtc/ChangeLog	2022-03-18 01:26:31 UTC (rev 291460)
@@ -1,3 +1,49 @@
+2022-03-17  Russell Epstein  <repst...@apple.com>
+
+        Cherry-pick r291455. rdar://problem/90449608
+
+    libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
+    https://bugs.webkit.org/show_bug.cgi?id=238058
+    
+    Reviewed by Mark Lam.
+    
+    Source/ThirdParty/ANGLE:
+    
+    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/ANGLE-dynamic.xcconfig:
+    
+    Source/ThirdParty/libwebrtc:
+    
+    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/libwebrtc.xcconfig:
+    
+    Source/WebGPU:
+    
+    We need to set  DYLIB_INSTALL_NAME_BASE for WK_USE_ALTERNATE_FRAMEWORKS_DIR installs without the
+    system content path prefix.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/WebGPU.xcconfig:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-17  Michael Saboff  <msab...@apple.com>
+
+            libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
+            https://bugs.webkit.org/show_bug.cgi?id=238058
+
+            Reviewed by Mark Lam.
+
+            We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+            We want to allow executables to use the framework via the symlink from the old location.
+
+            * Configurations/libwebrtc.xcconfig:
+
 2022-03-12  Jean-Yves Avenard  <j...@apple.com>
 
         Safari produces scrambled output for some webm videos with vp8 codec.

Modified: branches/safari-614.1.6-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (291459 => 291460)


--- branches/safari-614.1.6-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-03-18 01:19:24 UTC (rev 291459)
+++ branches/safari-614.1.6-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-03-18 01:26:31 UTC (rev 291460)
@@ -45,6 +45,7 @@
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
 DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS));
 DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);

Modified: branches/safari-614.1.6-branch/Source/WebGPU/ChangeLog (291459 => 291460)


--- branches/safari-614.1.6-branch/Source/WebGPU/ChangeLog	2022-03-18 01:19:24 UTC (rev 291459)
+++ branches/safari-614.1.6-branch/Source/WebGPU/ChangeLog	2022-03-18 01:26:31 UTC (rev 291460)
@@ -1,3 +1,50 @@
+2022-03-17  Russell Epstein  <repst...@apple.com>
+
+        Cherry-pick r291455. rdar://problem/90449608
+
+    libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
+    https://bugs.webkit.org/show_bug.cgi?id=238058
+    
+    Reviewed by Mark Lam.
+    
+    Source/ThirdParty/ANGLE:
+    
+    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/ANGLE-dynamic.xcconfig:
+    
+    Source/ThirdParty/libwebrtc:
+    
+    We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/libwebrtc.xcconfig:
+    
+    Source/WebGPU:
+    
+    We need to set  DYLIB_INSTALL_NAME_BASE for WK_USE_ALTERNATE_FRAMEWORKS_DIR installs without the
+    system content path prefix.
+    We want to allow executables to use the framework via the symlink from the old location.
+    
+    * Configurations/WebGPU.xcconfig:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-17  Michael Saboff  <msab...@apple.com>
+
+            libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
+            https://bugs.webkit.org/show_bug.cgi?id=238058
+
+            Reviewed by Mark Lam.
+
+            We need to set  DYLIB_INSTALL_NAME_BASE for WK_USE_ALTERNATE_FRAMEWORKS_DIR installs without the
+            system content path prefix.
+            We want to allow executables to use the framework via the symlink from the old location.
+
+            * Configurations/WebGPU.xcconfig:
+
 2022-03-12  Tim Horton  <timothy_hor...@apple.com>
 
         Adopt FALLBACK_PLATFORM_NAME in place of FALLBACK_PLATFORM

Modified: branches/safari-614.1.6-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (291459 => 291460)


--- branches/safari-614.1.6-branch/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-03-18 01:19:24 UTC (rev 291459)
+++ branches/safari-614.1.6-branch/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-03-18 01:26:31 UTC (rev 291460)
@@ -39,7 +39,7 @@
 
 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
+DYLIB_INSTALL_NAME_BASE_YES = $(WEBGPU_FRAMEWORKS_DIR);
 
 ALTERNATE_ROOT_PATH = $(WEBGPU_FRAMEWORKS_DIR);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to