mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 03:34:58 +00:00
4bbd00e934
readline is used on macOS and iOS for some javascript console (JSC). It seems to be easier to disable it than to fix it.
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
|
|
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
|
|
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
|
|
@@ -9,7 +9,6 @@ set(JSC_LIBRARIES
|
|
)
|
|
|
|
if (WTF_OS_MAC_OS_X)
|
|
- list(APPEND JSC_LIBRARIES edit)
|
|
endif ()
|
|
|
|
if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
|
|
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
|
--- a/Source/WTF/wtf/Platform.h
|
|
+++ b/Source/WTF/wtf/Platform.h
|
|
@@ -563,7 +563,6 @@
|
|
#if PLATFORM(IOS)
|
|
|
|
#define HAVE_NETWORK_EXTENSION 1
|
|
-#define HAVE_READLINE 1
|
|
#if USE(APPLE_INTERNAL_SDK)
|
|
#define USE_CFNETWORK 1
|
|
#endif
|
|
@@ -650,7 +649,6 @@
|
|
#define HAVE_MADV_DONTNEED 1
|
|
#define HAVE_MERGESORT 1
|
|
#define HAVE_PTHREAD_SETNAME_NP 1
|
|
-#define HAVE_READLINE 1
|
|
#define HAVE_SYS_TIMEB_H 1
|
|
|
|
#if !PLATFORM(GTK) && !PLATFORM(QT)
|
|
diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
|
|
--- a/Source/WTF/wtf/PlatformMac.cmake
|
|
+++ b/Source/WTF/wtf/PlatformMac.cmake
|
|
@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED)
|
|
|
|
find_library(COCOA_LIBRARY Cocoa)
|
|
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
|
|
-find_library(READLINE_LIBRARY Readline)
|
|
list(APPEND WTF_LIBRARIES
|
|
${COREFOUNDATION_LIBRARY}
|
|
${COCOA_LIBRARY}
|
|
- ${READLINE_LIBRARY}
|
|
libicucore.dylib
|
|
)
|
|
|