Title: [253499] trunk/Source
- Revision
- 253499
- Author
- [email protected]
- Date
- 2019-12-13 14:35:25 -0800 (Fri, 13 Dec 2019)
Log Message
MacCatalyst build of libANGLE is installed in the incorrect location
https://bugs.webkit.org/show_bug.cgi?id=205219
<rdar://problem/57713353>
Reviewed by Simon Fraser.
Source/ThirdParty/ANGLE:
Rename libANGLE.dylib into libANGLE-shared.dylib, so we can
avoid accidentally trying to link to the libANGLE.a that was
removed recently (but still exists in the SDK for now).
Also, make sure that we install into the correct location for
a Catalyst build.
* ANGLE.xcodeproj/project.pbxproj:
* Configurations/ANGLE.xcconfig:
* Configurations/Base.xcconfig:
Source/WebCore:
The location that WebCore was looking for embedded libraries was
incorrect for Catalyst builds. We never noticed because until now
there were no embedded libraries, and local builds all go into
the same location so this would only happen on Production builds.
Also, libANGLE became libANGLE-shared.
* Configurations/WebCore.xcconfig: Link with libANGLE's new name, and
look in the correct directory.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (253498 => 253499)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2019-12-13 21:46:25 UTC (rev 253498)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2019-12-13 22:35:25 UTC (rev 253499)
@@ -1499,7 +1499,7 @@
A3694FC423202C5100A83D8F /* BuiltinsWorkaroundGLSL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltinsWorkaroundGLSL.cpp; sourceTree = "<group>"; };
A3694FC523202C5200A83D8F /* BuiltinsWorkaroundGLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltinsWorkaroundGLSL.h; sourceTree = "<group>"; };
A3E827A8230CAE2C00E76682 /* commit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = commit.h; sourceTree = "<group>"; };
- FB39D0D11200F0E300088E69 /* libANGLE.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libANGLE.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ FB39D0D11200F0E300088E69 /* libANGLE-shared.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libANGLE-shared.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
FB39D2BF1200F3E600088E69 /* ShaderLang.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ShaderLang.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -2504,7 +2504,7 @@
FB39D0CC1200EF9B00088E69 /* Products */ = {
isa = PBXGroup;
children = (
- FB39D0D11200F0E300088E69 /* libANGLE.dylib */,
+ FB39D0D11200F0E300088E69 /* libANGLE-shared.dylib */,
);
name = Products;
sourceTree = "<group>";
@@ -2985,7 +2985,7 @@
);
name = ANGLE;
productName = angle;
- productReference = FB39D0D11200F0E300088E69 /* libANGLE.dylib */;
+ productReference = FB39D0D11200F0E300088E69 /* libANGLE-shared.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
/* End PBXNativeTarget section */
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (253498 => 253499)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-12-13 21:46:25 UTC (rev 253498)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-12-13 22:35:25 UTC (rev 253499)
@@ -1,3 +1,22 @@
+2019-12-13 Dean Jackson <[email protected]>
+
+ MacCatalyst build of libANGLE is installed in the incorrect location
+ https://bugs.webkit.org/show_bug.cgi?id=205219
+ <rdar://problem/57713353>
+
+ Reviewed by Simon Fraser.
+
+ Rename libANGLE.dylib into libANGLE-shared.dylib, so we can
+ avoid accidentally trying to link to the libANGLE.a that was
+ removed recently (but still exists in the SDK for now).
+
+ Also, make sure that we install into the correct location for
+ a Catalyst build.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * Configurations/ANGLE.xcconfig:
+ * Configurations/Base.xcconfig:
+
2019-12-11 Dean Jackson <[email protected]>
Produce a dummy libANGLE.a file to fool Apple's build test infrastructure
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (253498 => 253499)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2019-12-13 21:46:25 UTC (rev 253498)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2019-12-13 22:35:25 UTC (rev 253499)
@@ -1,7 +1,7 @@
#include "Version.xcconfig"
#include "WebKitTargetConditionals.xcconfig"
-PRODUCT_NAME = ANGLE;
+PRODUCT_NAME = ANGLE-shared;
EXECUTABLE_PREFIX = lib;
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (253498 => 253499)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2019-12-13 21:46:25 UTC (rev 253498)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2019-12-13 22:35:25 UTC (rev 253499)
@@ -87,7 +87,9 @@
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+NORMAL_WEBCORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+NORMAL_WEBCORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
Modified: trunk/Source/WebCore/ChangeLog (253498 => 253499)
--- trunk/Source/WebCore/ChangeLog 2019-12-13 21:46:25 UTC (rev 253498)
+++ trunk/Source/WebCore/ChangeLog 2019-12-13 22:35:25 UTC (rev 253499)
@@ -1,3 +1,21 @@
+2019-12-13 Dean Jackson <[email protected]>
+
+ MacCatalyst build of libANGLE is installed in the incorrect location
+ https://bugs.webkit.org/show_bug.cgi?id=205219
+ <rdar://problem/57713353>
+
+ Reviewed by Simon Fraser.
+
+ The location that WebCore was looking for embedded libraries was
+ incorrect for Catalyst builds. We never noticed because until now
+ there were no embedded libraries, and local builds all go into
+ the same location so this would only happen on Production builds.
+
+ Also, libANGLE became libANGLE-shared.
+
+ * Configurations/WebCore.xcconfig: Link with libANGLE's new name, and
+ look in the correct directory.
+
2019-12-13 Myles C. Maxfield <[email protected]>
[watchOS] Apple.com is rendered in Times New Roman
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (253498 => 253499)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2019-12-13 21:46:25 UTC (rev 253498)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2019-12-13 22:35:25 UTC (rev 253499)
@@ -41,9 +41,12 @@
WK_EMBEDDED_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks
WK_EMBEDDED_LIBRARY_DIR[sdk=macosx*] = $(WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WK_EMBEDDED_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
WK_EMBEDDED_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+WK_EMBEDDED_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+WK_EMBEDDED_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+
LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_EMBEDDED_LIBRARY_DIR)";
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
@@ -94,7 +97,7 @@
WK_IOSURFACE_ACCELERATOR_LDFLAGS_watchos = $(WK_IOSURFACE_ACCELERATOR_LDFLAGS_iphoneos);
WK_IOSURFACE_ACCELERATOR_LDFLAGS_appletvos = $(WK_IOSURFACE_ACCELERATOR_LDFLAGS_iphoneos);
-WK_ANGLE_LDFLAGS = -weak-lANGLE;
+WK_ANGLE_LDFLAGS = -weak-lANGLE-shared;
WK_LIBWEBRTC_LDFLAGS = $(WK_LIBWEBRTC_LDFLAGS_$(ENABLE_WEB_RTC));
WK_LIBWEBRTC_LDFLAGS_ENABLE_WEB_RTC = -framework VideoToolbox -framework CoreMedia -weak-lwebrtc;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
