Changeset 291713 in webkit

Timestamp:

Mar 22, 2022, 3:28:11 PM (5 years ago)

Author:

david_quesada@apple.com

Message:

REGRESSION(r291455): libwebrtc has the wrong install name when using override frameworks directory
​https://bugs.webkit.org/show_bug.cgi?id=238212
rdar://90604028

Reviewed by Alexey Proskuryakov.

r291455 introduced a default definition of DYLIB_INSTALL_NAME_BASE for non-macOS platforms that
stays defined as /S/L/PF/WebCore.framework/Frameworks. This explicit definition (rather than
falling back to the build system default of $INSTALL_PATH) is fine for those platforms but
clashes with the macOS definition of this variable when building with an override frameworks path:

DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);

Because of the new default definition of DYLIB_INSTALL_NAME_BASE, the semantics of this line
were changed from "use the install path as the install name when there's an override frameworks
directory" to "use /S/L/PF/WebCore.frameworks/Frameworks as the install name when there's an
override frameworks directory", which completely bypasses the point of the *override* directory.

Resolve this by redefining DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES to explicitly
use the INSTALL_PATH as the base of the install name, which was the original intent before
r291455 changed the behavior of falling back to DYLIB_INSTALL_NAME_BASE.

• Configurations/libwebrtc.xcconfig:

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Configurations/libwebrtc.xcconfig (modified) (1 diff)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2022-03-22  David Quesada  <david_quesada@apple.com>
+
+        REGRESSION(r291455): libwebrtc has the wrong install name when using override frameworks directory
+        https://bugs.webkit.org/show_bug.cgi?id=238212
+        rdar://90604028
+
+        Reviewed by Alexey Proskuryakov.
+
+        r291455 introduced a default definition of DYLIB_INSTALL_NAME_BASE for non-macOS platforms that
+        stays defined as /S/L/PF/WebCore.framework/Frameworks. This explicit definition (rather than
+        falling back to the build system default of $INSTALL_PATH) is fine for those platforms but
+        clashes with the macOS definition of this variable when building with an override frameworks path:
+
+            DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(DYLIB_INSTALL_NAME_BASE);
+
+        Because of the new default definition of `DYLIB_INSTALL_NAME_BASE`, the semantics of this line
+        were changed from "use the install path as the install name when there's an override frameworks
+        directory" to "use /S/L/PF/WebCore.frameworks/Frameworks as the install name when there's an
+        override frameworks directory", which completely bypasses the point of the *override* directory.
+
+        Resolve this by redefining DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES to explicitly
+        use the INSTALL_PATH as the base of the install name, which was the original intent before
+        r291455 changed the behavior of falling back to DYLIB_INSTALL_NAME_BASE.
+
+        * Configurations/libwebrtc.xcconfig:
+
 2022-03-21  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -49 +49 @@
 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);
+DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH);
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;