Changeset 291455 in webkit

Timestamp:

Mar 17, 2022, 5:46:15 PM (5 years ago)

Author:

msaboff@apple.com

Message:

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:

Location:

trunk/Source

Files:

• ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (modified) (1 diff)
• ThirdParty/libwebrtc/ChangeLog (modified) (1 diff)
• ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (modified) (1 diff)
• WebGPU/ChangeLog (modified) (1 diff)
• WebGPU/Configurations/WebGPU.xcconfig (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2022-03-17  Michael Saboff  <msaboff@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-14  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig

@@ -31 +31 @@
 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));

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2022-03-17  Michael Saboff  <msaboff@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-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

@@ -46 +46 @@
 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));

trunk/Source/WebGPU/ChangeLog

@@ +1 @@
+2022-03-17  Michael Saboff  <msaboff@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-17  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebGPU/Configurations/WebGPU.xcconfig

@@ -40 +40 @@
 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);