aboutsummaryrefslogtreecommitdiff
path: root/third-party
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2022-05-12 18:56:40 +0200
committerbfredl <bjorn.linse@gmail.com>2022-05-12 20:01:04 +0200
commit36613b888bae7df764a26a28ca1627a2c0c2edeb (patch)
treeff681fd0b45bbf34d8adc58eca9fbb058ff337a4 /third-party
parentde5ccf2348a1fabf3867da9256e4740a7dfcf004 (diff)
downloadrneovim-36613b888bae7df764a26a28ca1627a2c0c2edeb.tar.gz
rneovim-36613b888bae7df764a26a28ca1627a2c0c2edeb.tar.bz2
rneovim-36613b888bae7df764a26a28ca1627a2c0c2edeb.zip
refactor(eval): use Hashy McHashFace instead of gperf
this removes gperf as a build dependency
Diffstat (limited to 'third-party')
-rw-r--r--third-party/CMakeLists.txt12
-rw-r--r--third-party/cmake/BuildGperf.cmake68
-rw-r--r--third-party/cmake/GperfCMakeLists.txt30
3 files changed, 0 insertions, 110 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 3d842c9777..21d1f7906a 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -39,7 +39,6 @@ set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies dow
option(USE_BUNDLED "Use bundled dependencies." ON)
-option(USE_BUNDLED_GPERF "Use the bundled version of gperf." ${USE_BUNDLED})
option(USE_BUNDLED_UNIBILIUM "Use the bundled unibilium." ${USE_BUNDLED})
option(USE_BUNDLED_LIBTERMKEY "Use the bundled libtermkey." ${USE_BUNDLED})
option(USE_BUNDLED_LIBVTERM "Use the bundled libvterm." ${USE_BUNDLED})
@@ -109,10 +108,6 @@ else()
set(DEPS_C_COMPILER "${CMAKE_C_COMPILER}")
endif()
-if(USE_BUNDLED_GPERF)
- enable_language(CXX)
-endif()
-
if(CMAKE_CXX_COMPILER)
set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
endif()
@@ -176,9 +171,6 @@ set(LUV_SHA256 cabb7e650f35992686eb95ae167c71614e281cd2979fc804e4e70f8051555728)
set(LUA_COMPAT53_URL https://github.com/keplerproject/lua-compat-5.3/archive/v0.9.tar.gz)
set(LUA_COMPAT53_SHA256 ad05540d2d96a48725bb79a1def35cf6652a4e2ec26376e2617c8ce2baa6f416)
-set(GPERF_URL https://github.com/neovim/deps/raw/ff5b4b18a87397a8564016071ae64f64bcd8c635/opt/gperf-3.1.tar.gz)
-set(GPERF_SHA256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2)
-
# cat.exe curl.exe curl-ca-bundle.crt diff.exe tee.exe xxd.exe
set(WINTOOLS_URL https://github.com/neovim/deps/raw/d66e306abf5b846484b4f2adffd896bce7e065d2/opt/win32tools.zip)
set(WINTOOLS_SHA256 2fb2f8d69070b3f16e029913fb95008e6be33893d77fc358012396c275a0fdb7)
@@ -242,10 +234,6 @@ if(USE_BUNDLED_LUV)
include(BuildLuv)
endif()
-if(USE_BUNDLED_GPERF)
- include(BuildGperf)
-endif()
-
if(USE_BUNDLED_GETTEXT)
include(BuildGettext)
endif()
diff --git a/third-party/cmake/BuildGperf.cmake b/third-party/cmake/BuildGperf.cmake
deleted file mode 100644
index 5401191150..0000000000
--- a/third-party/cmake/BuildGperf.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-# Gperf recipe. Gperf is only required when building Neovim, when
-# cross compiling we still want to build for the HOST system, whenever
-# writing a recipe that is meant for cross-compile, use the HOSTDEPS_* variables
-# instead of DEPS_* - check the main CMakeLists.txt for a list.
-
-# BuildGperf(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
-# Reusable function to build Gperf, wraps ExternalProject_Add.
-# Failing to pass a command argument will result in no command being run
-function(BuildGperf)
- cmake_parse_arguments(_gperf
- ""
- ""
- "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
- ${ARGN})
-
- if(NOT _gperf_CONFIGURE_COMMAND AND NOT _gperf_BUILD_COMMAND
- AND NOT _gperf_INSTALL_COMMAND)
- message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND")
- endif()
-
- ExternalProject_Add(gperf
- PREFIX ${DEPS_BUILD_DIR}
- URL ${GPERF_URL}
- DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/gperf
- DOWNLOAD_COMMAND ${CMAKE_COMMAND}
- -DPREFIX=${DEPS_BUILD_DIR}
- -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/gperf
- -DURL=${GPERF_URL}
- -DEXPECTED_SHA256=${GPERF_SHA256}
- -DTARGET=gperf
- -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND "${_gperf_CONFIGURE_COMMAND}"
- BUILD_COMMAND "${_gperf_BUILD_COMMAND}"
- INSTALL_COMMAND "${_gperf_INSTALL_COMMAND}")
-endfunction()
-
-set(GPERF_BUILDARGS CC=${HOSTDEPS_C_COMPILER} CXX=${HOSTDEPS_CXX_COMPILER}
- LD=${HOSTDEPS_C_COMPILER})
-
-if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
-
- BuildGperf(
- CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/gperf/configure
- --prefix=${HOSTDEPS_INSTALL_DIR}
- MAKE=${MAKE_PRG} ${GPERF_BUILDARGS}
- INSTALL_COMMAND ${MAKE_PRG} install)
-
-elseif(MSVC OR MINGW)
-
- BuildGperf(
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GperfCMakeLists.txt
- ${DEPS_BUILD_DIR}/src/gperf/CMakeLists.txt
- COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/gperf/CMakeLists.txt
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
- -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
- BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
- INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
-
-else()
- message(FATAL_ERROR "Trying to build gperf in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
-endif()
diff --git a/third-party/cmake/GperfCMakeLists.txt b/third-party/cmake/GperfCMakeLists.txt
deleted file mode 100644
index 15ae305ba8..0000000000
--- a/third-party/cmake/GperfCMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(gperf LANGUAGES C CXX)
-
-add_executable(gperf
- lib/getline.cc
- lib/hash.cc
- lib/getopt.c
- lib/getopt1.c
- src/version.cc
- src/positions.cc
- src/options.cc
- src/keyword.cc
- src/keyword-list.cc
- src/input.cc
- src/bool-array.cc
- src/hash-table.cc
- src/search.cc
- src/output.cc
- src/main.cc)
-
-include_directories(lib)
-
-# Copy the config.h template without modifying it
-# because none of the definitions are necessary
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/src/config.h.in ${CMAKE_BINARY_DIR}/config/config.h)
-include_directories(${CMAKE_BINARY_DIR}/config)
-
-include(GNUInstallDirs)
-install(TARGETS gperf
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})