Title: [226161] trunk/Source/WebCore
- Revision
- 226161
- Author
- [email protected]
- Date
- 2017-12-19 17:10:11 -0800 (Tue, 19 Dec 2017)
Log Message
Unreviewed, rolling out r226094.
https://bugs.webkit.org/show_bug.cgi?id=181012
No longer needed to build without error. (Requested by xenon
on #webkit).
Reverted changeset:
"[GTK][WPE] Conditionalize libTASN1 use behind
ENABLE_SUBTLE_CRYPTO in the CMake files"
https://bugs.webkit.org/show_bug.cgi?id=180949
https://trac.webkit.org/changeset/226094
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (226160 => 226161)
--- trunk/Source/WebCore/ChangeLog 2017-12-20 01:08:40 UTC (rev 226160)
+++ trunk/Source/WebCore/ChangeLog 2017-12-20 01:10:11 UTC (rev 226161)
@@ -1,3 +1,18 @@
+2017-12-19 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r226094.
+ https://bugs.webkit.org/show_bug.cgi?id=181012
+
+ No longer needed to build without error. (Requested by xenon
+ on #webkit).
+
+ Reverted changeset:
+
+ "[GTK][WPE] Conditionalize libTASN1 use behind
+ ENABLE_SUBTLE_CRYPTO in the CMake files"
+ https://bugs.webkit.org/show_bug.cgi?id=180949
+ https://trac.webkit.org/changeset/226094
+
2017-12-19 Eric Carlson <[email protected]>
[MediaStream] Clean up RealtimeMediaSource interfaces
Modified: trunk/Source/WebCore/PlatformGTK.cmake (226160 => 226161)
--- trunk/Source/WebCore/PlatformGTK.cmake 2017-12-20 01:08:40 UTC (rev 226160)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-12-20 01:10:11 UTC (rev 226161)
@@ -104,6 +104,7 @@
${GLIB_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBSOUP_LIBRARIES}
+ ${LIBTASN1_LIBRARIES}
${HYPHEN_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
${X11_X11_LIB}
@@ -125,6 +126,7 @@
${GLIB_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
+ ${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
@@ -170,15 +172,6 @@
)
endif ()
-if (ENABLE_SUBTLE_CRYPTO)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${LIBTASN1_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${LIBTASN1_LIBRARIES}
- )
-endif ()
-
if (ENABLE_WAYLAND_TARGET)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
${WAYLAND_INCLUDE_DIRS}
Modified: trunk/Source/WebCore/PlatformWPE.cmake (226160 => 226161)
--- trunk/Source/WebCore/PlatformWPE.cmake 2017-12-20 01:08:40 UTC (rev 226160)
+++ trunk/Source/WebCore/PlatformWPE.cmake 2017-12-20 01:10:11 UTC (rev 226161)
@@ -71,6 +71,7 @@
${GLIB_LIBRARIES}
${ICU_LIBRARIES}
${LIBSOUP_LIBRARIES}
+ ${LIBTASN1_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
${WPE_LIBRARIES}
)
@@ -81,15 +82,7 @@
${GLIB_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
+ ${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
${WPE_INCLUDE_DIRS}
)
-
-if (ENABLE_SUBTLE_CRYPTO)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${LIBTASN1_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${LIBTASN1_LIBRARIES}
- )
-endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
