diff options
| author | John Szakmeister <john@szakmeister.net> | 2015-04-15 07:00:36 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2015-05-11 07:02:47 -0400 |
| commit | f0ab7c2ec1518c1e94303747db098c4fec0bb56c (patch) | |
| tree | 0999e52d8e403f345b15e9448a8d60568f0a0e02 | |
| parent | 208013ae399a28d78587979fb35a01bd335a855c (diff) | |
| download | rneovim-f0ab7c2ec1518c1e94303747db098c4fec0bb56c.tar.gz rneovim-f0ab7c2ec1518c1e94303747db098c4fec0bb56c.tar.bz2 rneovim-f0ab7c2ec1518c1e94303747db098c4fec0bb56c.zip | |
third-party: use the official jemalloc tarball
This avoids messages to stderr about VERSION being missing, and allows
us to skip the autogen step.
| -rw-r--r-- | third-party/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildJeMalloc.cmake | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 66edf9459c..3db6bb399f 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -74,8 +74,8 @@ set(LIBTERMKEY_SHA256 21846369081e6c9a0b615f4b3889c4cb809321c5ccc6e6c1640eb138f1 set(LIBVTERM_URL https://github.com/neovim/libvterm/archive/1b745d29d45623aa8d22a7b9288c7b0e331c7088.tar.gz) set(LIBVTERM_SHA256 3fc75908256c0d158d6c2a32d39f34e86bfd26364f5404b7d9c03bb70cdc3611) -set(JEMALLOC_URL https://github.com/jemalloc/jemalloc/archive/3.6.0.tar.gz) -set(JEMALLOC_SHA256 68175f729423305dc8573cb093025a8db525e1956583c7c5924416a9abaaacb6) +set(JEMALLOC_URL https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2) +set(JEMALLOC_SHA256 e16c2159dd3c81ca2dc3b5c9ef0d43e1f2f45b04548f42db12e7c12d7bdf84fe) if(USE_BUNDLED_UNIBILIUM) include(BuildUnibilium) diff --git a/third-party/cmake/BuildJeMalloc.cmake b/third-party/cmake/BuildJeMalloc.cmake index c3a0d890fc..9756906d97 100644 --- a/third-party/cmake/BuildJeMalloc.cmake +++ b/third-party/cmake/BuildJeMalloc.cmake @@ -10,9 +10,8 @@ ExternalProject_Add(jemalloc -DTARGET=jemalloc -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/jemalloc/autogen.sh && - ${DEPS_BUILD_DIR}/src/jemalloc/configure --enable-cc-silence - CC=${DEPS_C_COMPILER} --prefix=${DEPS_INSTALL_DIR} + CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/jemalloc/configure --enable-cc-silence + CC=${DEPS_C_COMPILER} --prefix=${DEPS_INSTALL_DIR} BUILD_COMMAND "" INSTALL_COMMAND ${MAKE_PRG} install_include install_lib) |