This is an automated email from the ASF dual-hosted git repository.

fsaintjacques pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e575ce  ARROW-8602: [C++][CMake] Fix ws2_32 link issue when 
cross-compiling on Linux
9e575ce is described below

commit 9e575cebaa99afd9d71bfc51bc08c7348948c4dd
Author: David Anthoff <anth...@berkeley.edu>
AuthorDate: Mon Apr 27 08:47:54 2020 -0400

    ARROW-8602: [C++][CMake] Fix ws2_32 link issue when cross-compiling on Linux
    
    With this patch I can cross-compile arrow from a Linux system, in 
particular I can compile Windows binaries on a Linux system (using 
https://binarybuilder.org/). I hope to eventually be able to use things from 
Julia with this.
    
    My best guess is that the inconsistent casing of `ws2_32` in the various 
build files/systems is no problem when compiling things on Windows because file 
systems there tend to be case insensitive.
    
    Closes #7001 from davidanthoff/fix-crosscompile
    
    Authored-by: David Anthoff <anth...@berkeley.edu>
    Signed-off-by: François Saint-Jacques <fsaintjacq...@gmail.com>
---
 cpp/CMakeLists.txt                  | 2 +-
 cpp/src/arrow/flight/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 31c5f82..c5f6583 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -798,7 +798,7 @@ endif()
 
 if(WIN32)
   # Winsock
-  list(APPEND ARROW_SYSTEM_LINK_LIBS "Ws2_32.dll")
+  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
 endif()
 
 if(NOT WIN32 AND NOT APPLE)
diff --git a/cpp/src/arrow/flight/CMakeLists.txt 
b/cpp/src/arrow/flight/CMakeLists.txt
index d65bbef..9d460be 100644
--- a/cpp/src/arrow/flight/CMakeLists.txt
+++ b/cpp/src/arrow/flight/CMakeLists.txt
@@ -27,7 +27,7 @@ set(ARROW_FLIGHT_STATIC_LINK_LIBS
     c-ares::cares)
 
 if(WIN32)
-  list(APPEND ARROW_FLIGHT_STATIC_LINK_LIBS Ws2_32.lib)
+  list(APPEND ARROW_FLIGHT_STATIC_LINK_LIBS ws2_32.lib)
 endif()
 
 if(GRPC_HAS_ADDRESS_SORTING)

Reply via email to