⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 287642 in webkit


Ignore:
Timestamp:
Jan 5, 2022, 11:42:45 AM (5 years ago)
Author:
msaboff@apple.com
Message:

REGRESSION (r287382): libANGLE is built into a wrong location on iOS
​https://bugs.webkit.org/show_bug.cgi?id=234857

Reviewed by Saam Barati.

Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix
for the alternate root framework location.

Source/ThirdParty/ANGLE:

  • Configurations/ANGLE-dynamic.xcconfig:

Source/ThirdParty/libwebrtc:

  • Configurations/libwebrtc.xcconfig:
Location:
trunk/Source/ThirdParty
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r287382 r287642  
     12022-01-05  Michael Saboff  <msaboff@apple.com>
     2
     3        REGRESSION (r287382): libANGLE is built into a wrong location on iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=234857
     5
     6        Reviewed by Saam Barati.
     7
     8        Reverted to the prior logic to compute INSTALL_PATH.  Then added an optional prefix
     9        for the alternate root framework location.
     10
     11        * Configurations/ANGLE-dynamic.xcconfig:
     12
    1132021-12-22  Michael Saboff  <msaboff@apple.com>
    214

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

    r287382 r287642  
    1515ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz;
    1616
    17 INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
    18 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    19 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
    20 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    21 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
     17INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
     18INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
     19
     20INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
     21INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
    2222INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    23 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
     23INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    2424INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    25 INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
     25INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
    2626
    2727DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r287382 r287642  
     12022-01-05  Michael Saboff  <msaboff@apple.com>
     2
     3        REGRESSION (r287382): libANGLE is built into a wrong location on iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=234857
     5
     6        Reviewed by Saam Barati.
     7
     8        Reverted to the prior logic to compute INSTALL_PATH.  Then added an optional prefix
     9        for the alternate root framework location.
     10
     11        * Configurations/libwebrtc.xcconfig:
     12
    1132021-12-22  Michael Saboff  <msaboff@apple.com>
    214

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

    r287382 r287642  
    3232EXPORTED_SYMBOLS_FILE[sdk=iphonesimulator*] = Configurations/libwebrtc.iOSsim.exp;
    3333
    34 INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
    35 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    36 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
    37 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
    38 INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    39 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
     34INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
     35INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
     36
     37INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
     38INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
     39INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
    4040INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    4141
Note: See TracChangeset for help on using the changeset viewer.