From 290e6e1c20ed8b0d61561338d3fc1c1caa8cb474 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Tue, 1 Aug 2017 22:54:27 +0900
Subject: [PATCH 1/3] [C++] Support downloading Boost

CentOS 6 ships old Boost. If we support downloading Boost, we'll build
RPM for CentOS 6 easily.
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 110 +++++++++++++++++---
 1 file changed, 95 insertions(+), 15 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 1271b8a4ab3f..d26d861ba462 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -124,6 +124,10 @@ set(Boost_ADDITIONAL_VERSIONS
   "1.62.0" "1.61"
   "1.61.0" "1.62"
   "1.60.0" "1.60")
+list(GET Boost_ADDITIONAL_VERSIONS 0 BOOST_LATEST_VERSION)
+string(REPLACE "." "_" BOOST_LATEST_VERSION_IN_PATH ${BOOST_LATEST_VERSION})
+set(BOOST_LATEST_URL
+  "https://dl.bintray.com/boostorg/release/${BOOST_LATEST_VERSION}/source/boost_${BOOST_LATEST_VERSION_IN_PATH}.tar.gz")
 
 if (ARROW_BOOST_USE_SHARED)
   # Find shared Boost libraries.
@@ -139,17 +143,27 @@ if (ARROW_BOOST_USE_SHARED)
 
   if (ARROW_BOOST_HEADER_ONLY)
     find_package(Boost)
+    if (Boost_FOUND)
+      set(BOOST_VENDORED FALSE)
+    else()
+      set(BOOST_VENDORED TRUE)
+    endif()
   else()
-    find_package(Boost COMPONENTS system filesystem REQUIRED)
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-      set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
-      set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+    find_package(Boost COMPONENTS system filesystem)
+    if (Boost_FOUND)
+      set(BOOST_VENDORED FALSE)
+      if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
+	set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
+	set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+      else()
+	set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
+	set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+      endif()
+      set(BOOST_SYSTEM_LIBRARY boost_system_shared)
+      set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared)
     else()
-      set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
-      set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+      set(BOOST_VENDORED TRUE)
     endif()
-    set(BOOST_SYSTEM_LIBRARY boost_system_shared)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared)
   endif()
 else()
   # Find static boost headers and libs
@@ -157,18 +171,84 @@ else()
   set(Boost_USE_STATIC_LIBS ON)
   if (ARROW_BOOST_HEADER_ONLY)
     find_package(Boost)
+    if (Boost_FOUND)
+      set(BOOST_VENDORED FALSE)
+    else()
+      set(BOOST_VENDORED TRUE)
+    endif()
+  else()
+    find_package(Boost COMPONENTS system filesystem)
+    if (Boost_FOUND)
+      set(BOOST_VENDORED FALSE)
+      if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
+	set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
+	set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+      else()
+	set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
+	set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+      endif()
+      set(BOOST_SYSTEM_LIBRARY boost_system_static)
+      set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static)
+    else()
+      set(BOOST_VENDORED TRUE)
+    endif()
+  endif()
+endif()
+
+if (BOOST_VENDORED)
+  set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep")
+  set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib")
+  if (ARROW_BOOST_USE_SHARED)
+    set(BOOST_BUILD_LINK "shared")
+    set(BOOST_SHARED_SYSTEM_LIBRARY
+      "${BOOST_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_system${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(BOOST_SHARED_FILESYSTEM_LIBRARY
+      "${BOOST_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_filesystem${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(BOOST_SYSTEM_LIBRARY "${BOOST_SHARED_SYSTEM_LIBRARY}")
+    set(BOOST_FILESYSTEM_LIBRARY "${BOOST_SHARED_FILESYSTEM_LIBRARY}")
+  else()
+    set(BOOST_BUILD_LINK "static")
+    set(BOOST_STATIC_SYSTEM_LIBRARY
+      "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    set(BOOST_STATIC_FILESYSTEM_LIBRARY
+      "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    set(BOOST_SYSTEM_LIBRARY "${BOOST_STATIC_SYSTEM_LIBRARY}")
+    set(BOOST_FILESYSTEM_LIBRARY "${BOOST_STATIC_FILESYSTEM_LIBRARY}")
+  endif()
+  if (ARROW_BOOST_HEADER_ONLY)
+    set(BOOST_BUILD_PRODUCTS)
+    set(BOOST_CONFIGURE_COMMAND "")
+    set(BOOST_BUILD_COMMAND "")
   else()
-    find_package(Boost COMPONENTS system filesystem REQUIRED)
+    set(BOOST_BUILD_PRODUCTS
+      ${BOOST_SYSTEM_LIBRARY}
+      ${BOOST_FILESYSTEM_LIBRARY})
+    set(BOOST_CONFIGURE_COMMAND
+      "./bootstrap.sh"
+      "--prefix=${BOOST_PREFIX}"
+      "--with-libraries=filesystem,system")
     if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-      set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
-      set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+      set(BOOST_BUILD_VARIANT "debug")
     else()
-      set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
-      set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+      set(BOOST_BUILD_VARIANT "release")
     endif()
-    set(BOOST_SYSTEM_LIBRARY boost_system_static)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static)
+    set(BOOST_BUILD_COMMAND
+      "./b2"
+      "link=${BOOST_BUILD_LINK}"
+      "variant=${BOOST_BUILD_VARIANT}"
+      "cxxflags=-fPIC")
   endif()
+  ExternalProject_Add(boost_ep
+    URL ${BOOST_LATEST_URL}
+    BUILD_BYPRODUCTS ${BOOST_BUILD_PRODUCTS}
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
+    BUILD_COMMAND ${BOOST_BUILD_COMMAND}
+    INSTALL_COMMAND ""
+    ${EP_LOG_OPTIONS})
+  set(Boost_INCLUDE_DIR "${BOOST_PREFIX}")
+  set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}")
+  add_dependencies(arrow_dependencies boost_ep)
 endif()
 
 message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIRS})

From 832673d79c25a8cbef5824539c62242e2fdd84cf Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Wed, 2 Aug 2017 22:53:32 +0900
Subject: [PATCH 2/3] [C++] Add ARROW_BOOST_VENDORED option

If it's specified, you don't need to install Boost by yourself. Boost
will be downloaded in build time.
---
 cpp/CMakeLists.txt                          |   4 +
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 114 ++++++++------------
 2 files changed, 51 insertions(+), 67 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 07b8e15b504e..eeff9124ad98 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -114,6 +114,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
     "Rely on boost shared libraries where relevant"
     ON)
 
+  option(ARROW_BOOST_VENDORED
+    "Use vendored Boost instead of existing Boost"
+    OFF)
+
   option(ARROW_PYTHON
     "Build the Arrow CPython extensions"
     OFF)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index d26d861ba462..4064a786fded 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -129,73 +129,7 @@ string(REPLACE "." "_" BOOST_LATEST_VERSION_IN_PATH ${BOOST_LATEST_VERSION})
 set(BOOST_LATEST_URL
   "https://dl.bintray.com/boostorg/release/${BOOST_LATEST_VERSION}/source/boost_${BOOST_LATEST_VERSION_IN_PATH}.tar.gz")
 
-if (ARROW_BOOST_USE_SHARED)
-  # Find shared Boost libraries.
-  set(Boost_USE_STATIC_LIBS OFF)
-
-  if(MSVC)
-    # disable autolinking in boost
-    add_definitions(-DBOOST_ALL_NO_LIB)
-
-    # force all boost libraries to dynamic link
-    add_definitions(-DBOOST_ALL_DYN_LINK)
-  endif()
-
-  if (ARROW_BOOST_HEADER_ONLY)
-    find_package(Boost)
-    if (Boost_FOUND)
-      set(BOOST_VENDORED FALSE)
-    else()
-      set(BOOST_VENDORED TRUE)
-    endif()
-  else()
-    find_package(Boost COMPONENTS system filesystem)
-    if (Boost_FOUND)
-      set(BOOST_VENDORED FALSE)
-      if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-	set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
-	set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
-      else()
-	set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
-	set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
-      endif()
-      set(BOOST_SYSTEM_LIBRARY boost_system_shared)
-      set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared)
-    else()
-      set(BOOST_VENDORED TRUE)
-    endif()
-  endif()
-else()
-  # Find static boost headers and libs
-  # TODO Differentiate here between release and debug builds
-  set(Boost_USE_STATIC_LIBS ON)
-  if (ARROW_BOOST_HEADER_ONLY)
-    find_package(Boost)
-    if (Boost_FOUND)
-      set(BOOST_VENDORED FALSE)
-    else()
-      set(BOOST_VENDORED TRUE)
-    endif()
-  else()
-    find_package(Boost COMPONENTS system filesystem)
-    if (Boost_FOUND)
-      set(BOOST_VENDORED FALSE)
-      if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-	set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
-	set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
-      else()
-	set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
-	set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
-      endif()
-      set(BOOST_SYSTEM_LIBRARY boost_system_static)
-      set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static)
-    else()
-      set(BOOST_VENDORED TRUE)
-    endif()
-  endif()
-endif()
-
-if (BOOST_VENDORED)
+if (ARROW_BOOST_VENDORED)
   set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep")
   set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib")
   if (ARROW_BOOST_USE_SHARED)
@@ -249,6 +183,52 @@ if (BOOST_VENDORED)
   set(Boost_INCLUDE_DIR "${BOOST_PREFIX}")
   set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}")
   add_dependencies(arrow_dependencies boost_ep)
+else()
+  if (ARROW_BOOST_USE_SHARED)
+    # Find shared Boost libraries.
+    set(Boost_USE_STATIC_LIBS OFF)
+
+    if(MSVC)
+      # disable autolinking in boost
+      add_definitions(-DBOOST_ALL_NO_LIB)
+
+      # force all boost libraries to dynamic link
+      add_definitions(-DBOOST_ALL_DYN_LINK)
+    endif()
+
+    if (ARROW_BOOST_HEADER_ONLY)
+      find_package(Boost REQUIRED)
+    else()
+      find_package(Boost COMPONENTS system filesystem REQUIRED)
+      if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
+	set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
+	set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+      else()
+	set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
+	set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+      endif()
+      set(BOOST_SYSTEM_LIBRARY boost_system_shared)
+      set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared)
+    endif()
+  else()
+    # Find static boost headers and libs
+    # TODO Differentiate here between release and debug builds
+    set(Boost_USE_STATIC_LIBS ON)
+    if (ARROW_BOOST_HEADER_ONLY)
+      find_package(Boost REQUIRED)
+    else()
+      find_package(Boost COMPONENTS system filesystem REQUIRED)
+      if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
+	set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG})
+	set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+      else()
+	set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE})
+	set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+      endif()
+      set(BOOST_SYSTEM_LIBRARY boost_system_static)
+      set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static)
+    endif()
+  endif()
 endif()
 
 message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIRS})

From 5bf6818ed638aba00d0e7a6189162c5a2b57e1f4 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Wed, 2 Aug 2017 23:00:50 +0900
Subject: [PATCH 3/3] [C++] Always use static link for vendored Boost

Boost libraries are used only for test. So we don't need to build
shared library.
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 24 ++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 4064a786fded..ae48e8d2fb97 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -132,23 +132,13 @@ set(BOOST_LATEST_URL
 if (ARROW_BOOST_VENDORED)
   set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep")
   set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib")
-  if (ARROW_BOOST_USE_SHARED)
-    set(BOOST_BUILD_LINK "shared")
-    set(BOOST_SHARED_SYSTEM_LIBRARY
-      "${BOOST_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_system${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set(BOOST_SHARED_FILESYSTEM_LIBRARY
-      "${BOOST_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}boost_filesystem${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set(BOOST_SYSTEM_LIBRARY "${BOOST_SHARED_SYSTEM_LIBRARY}")
-    set(BOOST_FILESYSTEM_LIBRARY "${BOOST_SHARED_FILESYSTEM_LIBRARY}")
-  else()
-    set(BOOST_BUILD_LINK "static")
-    set(BOOST_STATIC_SYSTEM_LIBRARY
-      "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    set(BOOST_STATIC_FILESYSTEM_LIBRARY
-      "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    set(BOOST_SYSTEM_LIBRARY "${BOOST_STATIC_SYSTEM_LIBRARY}")
-    set(BOOST_FILESYSTEM_LIBRARY "${BOOST_STATIC_FILESYSTEM_LIBRARY}")
-  endif()
+  set(BOOST_BUILD_LINK "static")
+  set(BOOST_STATIC_SYSTEM_LIBRARY
+    "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX}")
+  set(BOOST_STATIC_FILESYSTEM_LIBRARY
+    "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}")
+  set(BOOST_SYSTEM_LIBRARY "${BOOST_STATIC_SYSTEM_LIBRARY}")
+  set(BOOST_FILESYSTEM_LIBRARY "${BOOST_STATIC_FILESYSTEM_LIBRARY}")
   if (ARROW_BOOST_HEADER_ONLY)
     set(BOOST_BUILD_PRODUCTS)
     set(BOOST_CONFIGURE_COMMAND "")