Unreviewed, rolling out r226094.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Dec 2017 01:10:11 +0000 (01:10 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Dec 2017 01:10:11 +0000 (01:10 +0000)
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

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

Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformWPE.cmake

index fb600be..3ff5599 100644 (file)
@@ -1,3 +1,18 @@
+2017-12-19  Commit Queue  <commit-queue@webkit.org>
+
+        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  <eric.carlson@apple.com>
 
         [MediaStream] Clean up RealtimeMediaSource interfaces
index 534cce8..1532bf7 100644 (file)
@@ -104,6 +104,7 @@ list(APPEND WebCore_LIBRARIES
     ${GLIB_LIBRARIES}
     ${LIBSECRET_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
+    ${LIBTASN1_LIBRARIES}
     ${HYPHEN_LIBRARIES}
     ${UPOWERGLIB_LIBRARIES}
     ${X11_X11_LIB}
@@ -125,6 +126,7 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${GLIB_INCLUDE_DIRS}
     ${LIBSECRET_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}
+    ${LIBTASN1_INCLUDE_DIRS}
     ${UPOWERGLIB_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
 )
@@ -170,15 +172,6 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
     )
 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}
index 5bb1dc6..e8145fa 100644 (file)
@@ -71,6 +71,7 @@ list(APPEND WebCore_LIBRARIES
     ${GLIB_LIBRARIES}
     ${ICU_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
+    ${LIBTASN1_LIBRARIES}
     ${UPOWERGLIB_LIBRARIES}
     ${WPE_LIBRARIES}
 )
@@ -81,15 +82,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${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 ()