diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-28 13:19:47 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-06-28 13:19:47 +0200 |
| commit | c696fcdcaa99e8d9114cd9713f73c4cb241d0dd8 (patch) | |
| tree | 7c70201903b62d16119ecce566d798f040535d54 | |
| parent | 6765bbc651942b8dc67ab1a14abf4eab1929e3b6 (diff) | |
| download | rneovim-c696fcdcaa99e8d9114cd9713f73c4cb241d0dd8.tar.gz rneovim-c696fcdcaa99e8d9114cd9713f73c4cb241d0dd8.tar.bz2 rneovim-c696fcdcaa99e8d9114cd9713f73c4cb241d0dd8.zip | |
build: remove patch: luv-Add-missing-definitions-for-MinGW [skip travis] #10360
Added in 4ae7acd15 initially, but seems to not be necessary anymore,
and/or should be send upstream otherwise.
| -rw-r--r-- | third-party/cmake/BuildLuv.cmake | 7 | ||||
| -rw-r--r-- | third-party/patches/luv-Add-missing-definitions-for-MinGW.patch | 24 |
2 files changed, 0 insertions, 31 deletions
diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake index 5de5ddbf9c..e515823d57 100644 --- a/third-party/cmake/BuildLuv.cmake +++ b/third-party/cmake/BuildLuv.cmake @@ -59,13 +59,6 @@ set(LUV_INCLUDE_FLAGS # directory set(LUV_PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LUV_SRC_DIR}/rockspecs ${LUV_SRC_DIR}) -if(MINGW) - set(LUV_PATCH_COMMAND - ${LUV_PATCH_COMMAND} - COMMAND ${GIT_EXECUTABLE} -C ${LUV_SRC_DIR} init - COMMAND ${GIT_EXECUTABLE} -C ${LUV_SRC_DIR} apply --ignore-whitespace - ${CMAKE_CURRENT_SOURCE_DIR}/patches/luv-Add-missing-definitions-for-MinGW.patch) -endif() set(LUV_CONFIGURE_COMMAND_COMMON ${CMAKE_COMMAND} ${LUV_SRC_DIR} diff --git a/third-party/patches/luv-Add-missing-definitions-for-MinGW.patch b/third-party/patches/luv-Add-missing-definitions-for-MinGW.patch deleted file mode 100644 index 8954ae21c3..0000000000 --- a/third-party/patches/luv-Add-missing-definitions-for-MinGW.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/dns.c b/src/dns.c -index 8634157..5f36625 100644 ---- a/src/dns.c -+++ b/src/dns.c -@@ -20,6 +20,19 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <netdb.h> -+#elif __MINGW32__ -+# ifndef AI_NUMERICSERV -+# define AI_NUMERICSERV 0x0008 -+# endif -+# ifndef AI_ALL -+# define AI_ALL 0x00000100 -+# endif -+# ifndef AI_ADDRCONFIG -+# define AI_ADDRCONFIG 0x00000400 -+# endif -+# ifndef AI_V4MAPPED -+# define AI_V4MAPPED 0x00000800 -+# endif - #endif - - static void luv_pushaddrinfo(lua_State* L, struct addrinfo* res) { |