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

Changeset 287644 in webkit


Ignore:
Timestamp:
Jan 5, 2022, 11:54:56 AM (5 years ago)
Author:
Russell Epstein
Message:

Cherry-pick r287642. rdar://problem/87072368

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:

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

Location:
branches/safari-613.1.12-branch/Source/ThirdParty
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/ChangeLog

    r287401 r287644  
     12022-01-05  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r287642. rdar://problem/87072368
     4
     5    REGRESSION (r287382): libANGLE is built into a wrong location on iOS
     6    https://bugs.webkit.org/show_bug.cgi?id=234857
     7   
     8    Reviewed by Saam Barati.
     9   
     10    Reverted to the prior logic to compute INSTALL_PATH.  Then added an optional prefix
     11    for the alternate root framework location.
     12   
     13    Source/ThirdParty/ANGLE:
     14   
     15    * Configurations/ANGLE-dynamic.xcconfig:
     16   
     17    Source/ThirdParty/libwebrtc:
     18   
     19    * Configurations/libwebrtc.xcconfig:
     20   
     21   
     22    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287642 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     23
     24    2022-01-05  Michael Saboff  <msaboff@apple.com>
     25
     26            REGRESSION (r287382): libANGLE is built into a wrong location on iOS
     27            https://bugs.webkit.org/show_bug.cgi?id=234857
     28
     29            Reviewed by Saam Barati.
     30
     31            Reverted to the prior logic to compute INSTALL_PATH.  Then added an optional prefix
     32            for the alternate root framework location.
     33
     34            * Configurations/ANGLE-dynamic.xcconfig:
     35
    1362021-12-23  Alan Coon  <alancoon@apple.com>
    237

  • branches/safari-613.1.12-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig

    r287401 r287644  
    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));

  • branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/ChangeLog

    r287401 r287644  
     12022-01-05  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r287642. rdar://problem/87072368
     4
     5    REGRESSION (r287382): libANGLE is built into a wrong location on iOS
     6    https://bugs.webkit.org/show_bug.cgi?id=234857
     7   
     8    Reviewed by Saam Barati.
     9   
     10    Reverted to the prior logic to compute INSTALL_PATH.  Then added an optional prefix
     11    for the alternate root framework location.
     12   
     13    Source/ThirdParty/ANGLE:
     14   
     15    * Configurations/ANGLE-dynamic.xcconfig:
     16   
     17    Source/ThirdParty/libwebrtc:
     18   
     19    * Configurations/libwebrtc.xcconfig:
     20   
     21   
     22    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287642 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     23
     24    2022-01-05  Michael Saboff  <msaboff@apple.com>
     25
     26            REGRESSION (r287382): libANGLE is built into a wrong location on iOS
     27            https://bugs.webkit.org/show_bug.cgi?id=234857
     28
     29            Reviewed by Saam Barati.
     30
     31            Reverted to the prior logic to compute INSTALL_PATH.  Then added an optional prefix
     32            for the alternate root framework location.
     33
     34            * Configurations/libwebrtc.xcconfig:
     35
    1362021-12-23  Alan Coon  <alancoon@apple.com>
    237

  • branches/safari-613.1.12-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

    r287401 r287644  
    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.