From 1e72b2e6bd7a2b79483ec0a9ef25c56b6fb462d4 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 11 May 2015 22:50:26 -0400 Subject: [PATCH] contrib: Update local.mk DUSE_JEMALLOC was removed in 8130eb1191aece52d8b2790302abf1bd09aaf90f Helped-by: Florian Walch Helped-by: John Szakmeister --- contrib/local.mk.example | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/contrib/local.mk.example b/contrib/local.mk.example index 12297eceba..1c3ea4ab40 100644 --- a/contrib/local.mk.example +++ b/contrib/local.mk.example @@ -1,16 +1,12 @@ -# Copy this to 'local.mk' in the repository root to take effect. +# Copy this to 'local.mk' in the repository root. # Individual entries must be uncommented to take effect. # By default, the installation prefix is '/usr/local'. -# CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=/usr/local/neovim-latest +# CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=/usr/local/nvim-latest # These CFLAGS can be used in addition to those specified in CMakeLists.txt: # CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-ftrapv -Wlogical-op" -# By default, the jemalloc family of memory allocation functions are used. -# Uncomment the following to instead use libc memory allocation functions: -# CMAKE_EXTRA_FLAGS="-DUSE_JEMALLOC=OFF" - # Sets the build type; defaults to Debug. Valid values: # # - Debug: Disables optimizations (-O0), enables debug information. @@ -28,8 +24,25 @@ # # CMAKE_BUILD_TYPE := Debug -# By default, all libraries are statically linked to nvim. Uncomment these -# entries to use dynamic linking instead. +# By default, nvim uses bundled versions of its required third-party +# dependencies. +# Uncomment these entries to instead use system-wide installations of +# them. +# +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_BUSTED=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_DEPS=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_JEMALLOC=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBTERMKEY=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBUV=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBVTERM=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUAJIT=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUAROCKS=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_MSGPACK=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_UNIBILIUM=OFF + +# By default, bundled libraries are statically linked to nvim. +# This has no effect for non-bundled deps, which are always dynamically linked. +# Uncomment these entries to instead use dynamic linking. # # CMAKE_EXTRA_FLAGS += -DLIBTERMKEY_USE_STATIC=OFF # CMAKE_EXTRA_FLAGS += -DLIBUNIBILIUM_USE_STATIC=OFF