Bug#35805629 Bundle boost headers [cmake]

Bundle necessary boost sources, and remove support for download or external sources.

Create a cmake INTERFACE library extra::boost, and link with this,
rather than using INCLUDE_DIRECTORIES.

Remove BOOST from RPM specs.

Change-Id: I04f64114392f6f154b226fce35cbbcb327c42e7f

Author: Tor Didriksen

client/dump/CMakeLists.txt

@@ -20,16 +20,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-# Prevent Boost from including external precompiled Boost libraries,
-# and turn off unused functionality.
-IF(USING_LOCAL_BOOST)
-  ADD_DEFINITIONS(
-    -DBOOST_ALL_NO_LIB
-    -DBOOST_SYSTEM_NO_DEPRECATED)
-ENDIF()
-
-INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
-
 SET(MYSQLPUMP_LIB_SOURCES
   abstract_chain_element.cc
   abstract_connection_provider.cc
@@ -108,7 +98,7 @@ ENDIF()
 ADD_STATIC_LIBRARY(mysqlpump_lib
   ${MYSQLPUMP_LIB_SOURCES}
   LINK_LIBRARIES
-  client_base ext::lz4 ext::zlib
+  client_base ext::lz4 ext::zlib extra::boost
   )
 
 MYSQL_ADD_EXECUTABLE(mysqlpump  program.cc)

cmake/boost.cmake

@@ -20,314 +20,29 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-# We want boost 1.77.0 in order to build our boost/geometry code.
-# The boost tarball is fairly big, and takes several minutes
-# to download. So we recommend downloading/unpacking it
-# only once, in a place visible from any git sandbox.
-# We use only header files, so there should be no binary dependencies.
-
-# Downloading the tarball takes about 5 minutes here at the office.
-# Here are some size/time data for unpacking the tarball on my desktop:
-#  size tarball-name
-#  67M boost_1_55_0.tar.gz  unzipping headers    ~2 seconds 117M
-#                           unzipping everything ~3 seconds 485M
-# 8,8M boost_headers.tar.gz unzipping everything <1 second
-
-# Invoke with -DWITH_BOOST=<directory> or set WITH_BOOST in environment.
-# If WITH_BOOST is *not* set, or is set to the special value "system",
-# we assume that the correct version (see below)
-# is installed on the compile host in the standard location.
-
 SET(BOOST_PACKAGE_NAME "boost_1_77_0")
-SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.bz2")
-SET(BOOST_DOWNLOAD_URL
-  "https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/${BOOST_TARBALL}"
-  )
-
-SET(OLD_PACKAGE_NAMES
-  "boost_1_55_0"
-  "boost_1_56_0"
-  "boost_1_57_0"
-  "boost_1_58_0"
-  "boost_1_59_0"
-  "boost_1_60_0"
-  "boost_1_61_0"
-  "boost_1_62_0"
-  "boost_1_63_0"
-  "boost_1_64_0"
-  "boost_1_65_0"
-  "boost_1_66_0"
-  "boost_1_67_0"
-  "boost_1_68_0"
-  "boost_1_69_0"
-  "boost_1_70_0"
-  "boost_1_71_0"
-  "boost_1_72_0"
-  "boost_1_73_0"
-)
-
-MACRO(RESET_BOOST_VARIABLES)
-  UNSET(BOOST_INCLUDE_DIR)
-  UNSET(BOOST_INCLUDE_DIR CACHE)
-  UNSET(LOCAL_BOOST_DIR)
-  UNSET(LOCAL_BOOST_DIR CACHE)
-  UNSET(LOCAL_BOOST_ZIP)
-  UNSET(LOCAL_BOOST_ZIP CACHE)
-ENDMACRO()
-
-MACRO(ECHO_BOOST_VARIABLES)
-  MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
-  MESSAGE(STATUS "LOCAL_BOOST_DIR ${LOCAL_BOOST_DIR}")
-  MESSAGE(STATUS "LOCAL_BOOST_ZIP ${LOCAL_BOOST_ZIP}")
-ENDMACRO()
-
-MACRO(LOOKUP_OLD_PACKAGE_NAMES)
-  FOREACH(pkg ${OLD_PACKAGE_NAMES})
-    FIND_FILE(OLD_BOOST_DIR
-              NAMES "${pkg}"
-              PATHS ${WITH_BOOST}
-              NO_DEFAULT_PATH
-             )
-    IF(OLD_BOOST_DIR)
-      MESSAGE(STATUS "")
-      MESSAGE(STATUS "Found old boost installation at ${OLD_BOOST_DIR}")
-      MESSAGE(STATUS "You must upgrade to ${BOOST_PACKAGE_NAME}")
-      MESSAGE(STATUS "")
-    ENDIF()
-    UNSET(OLD_BOOST_DIR)
-    UNSET(OLD_BOOST_DIR CACHE)
-  ENDFOREACH()
-ENDMACRO()
-
-MACRO(COULD_NOT_FIND_BOOST)
-  LOOKUP_OLD_PACKAGE_NAMES()
-  ECHO_BOOST_VARIABLES()
-  RESET_BOOST_VARIABLES()
-  MESSAGE(STATUS "Could not find (the correct version of) boost.")
-  MESSAGE(STATUS "MySQL currently requires ${BOOST_PACKAGE_NAME}\n")
-  MESSAGE(FATAL_ERROR
-    "You can download it with -DDOWNLOAD_BOOST=1 -DWITH_BOOST=<directory>\n"
-    "This CMake script will look for boost in <directory>. "
-    "If it is not there, it will download and unpack it "
-    "(in that directory) for you.\n"
-    "You can also download boost manually, from ${BOOST_DOWNLOAD_URL}\n"
-    "If you are inside a firewall, you may need to use an https proxy:\n"
-    "export https_proxy=http://example.com:80\n"
-    )
-ENDMACRO()
-
-# Pick value from environment if not set on command line.
-IF(DEFINED ENV{WITH_BOOST} AND NOT DEFINED WITH_BOOST)
-  SET(WITH_BOOST "$ENV{WITH_BOOST}")
-ENDIF()
-
-# Pick value from environment if not set on command line.
-IF(DEFINED ENV{BOOST_ROOT} AND NOT DEFINED WITH_BOOST)
-  SET(WITH_BOOST "$ENV{BOOST_ROOT}")
-ENDIF()
-
-IF(WITH_BOOST AND WITH_BOOST STREQUAL "system")
-  UNSET(WITH_BOOST)
-  UNSET(WITH_BOOST CACHE)
-ENDIF()
-
-# Update the cache, to make it visible in cmake-gui.
-SET(WITH_BOOST ${WITH_BOOST} CACHE PATH
-  "Path to boost sources: a directory, or a tarball to be unzipped.")
-
-# If the value of WITH_BOOST changes, we must unset all dependent variables:
-IF(OLD_WITH_BOOST)
-  IF(NOT "${OLD_WITH_BOOST}" STREQUAL "${WITH_BOOST}")
-    RESET_BOOST_VARIABLES()
-  ENDIF()
-ENDIF()
-
-SET(OLD_WITH_BOOST ${WITH_BOOST} CACHE INTERNAL
-  "Previous version of WITH_BOOST" FORCE)
 
-IF (WITH_BOOST)
-  ## Did we get a full path name, including file name?
-  IF (${WITH_BOOST} MATCHES ".*\\.tar.bz2" OR ${WITH_BOOST} MATCHES ".*\\.zip")
-    GET_FILENAME_COMPONENT(BOOST_DIR ${WITH_BOOST} PATH)
-    GET_FILENAME_COMPONENT(BOOST_ZIP ${WITH_BOOST} NAME)
-    FIND_FILE(LOCAL_BOOST_ZIP
-              NAMES ${BOOST_ZIP}
-              PATHS ${BOOST_DIR}
-              NO_DEFAULT_PATH
-             )
-  ENDIF()
-  ## Did we get a path name to the directory of the .tar.bz2 or .zip file?
-  FIND_FILE(LOCAL_BOOST_ZIP
-            NAMES "${BOOST_PACKAGE_NAME}.tar.bz2" "${BOOST_PACKAGE_NAME}.zip"
-            PATHS ${WITH_BOOST}
-            NO_DEFAULT_PATH
-           )
-  ## Did we get a path name to the directory of an unzipped version?
-  FIND_FILE(LOCAL_BOOST_DIR
-            NAMES "${BOOST_PACKAGE_NAME}"
-            PATHS ${WITH_BOOST}
-            NO_DEFAULT_PATH
-           )
-  ## Did we get a path name to an unzippped version?
-  FIND_PATH(LOCAL_BOOST_DIR
-            NAMES "boost/version.hpp"
-            PATHS ${WITH_BOOST}
-            NO_DEFAULT_PATH
-           )
-  IF(LOCAL_BOOST_DIR)
-    MESSAGE(STATUS "Local boost dir ${LOCAL_BOOST_DIR}")
-  ENDIF()
-  IF(LOCAL_BOOST_ZIP)
-    MESSAGE(STATUS "Local boost zip ${LOCAL_BOOST_ZIP}")
-    GET_FILE_SIZE(${LOCAL_BOOST_ZIP} LOCAL_BOOST_ZIP_SIZE)
-    IF(LOCAL_BOOST_ZIP_SIZE EQUAL 0)
-      # A previous failed download has left an empty file, most likely the
-      # user pressed Ctrl-C to kill a hanging connection due to missing vpn
-      # proxy.  Remove it!
-      MESSAGE("${LOCAL_BOOST_ZIP} is zero length. Deleting it.")
-      FILE(REMOVE ${WITH_BOOST}/${BOOST_TARBALL})
-      UNSET(LOCAL_BOOST_ZIP)
-      UNSET(LOCAL_BOOST_ZIP CACHE)
-    ENDIF()
-    UNSET(LOCAL_BOOST_ZIP_ZERO_LENGTH)
-  ENDIF()
-ENDIF()
-
-# There is a similar option in unittest/gunit.
-# But the boost tarball is much bigger, so we have a separate option.
-OPTION(DOWNLOAD_BOOST "Download boost from sourceforge." OFF)
-SET(DOWNLOAD_BOOST_TIMEOUT 600 CACHE STRING
-  "Timeout in seconds when downloading boost.")
-
-# If we could not find it, then maybe download it.
-IF(WITH_BOOST AND NOT LOCAL_BOOST_ZIP AND NOT LOCAL_BOOST_DIR)
-  IF(NOT DOWNLOAD_BOOST)
-    MESSAGE(STATUS "WITH_BOOST=${WITH_BOOST}")
-    COULD_NOT_FIND_BOOST()
-  ENDIF()
-  # Download the tarball
-  MESSAGE(STATUS "Downloading ${BOOST_TARBALL} to ${WITH_BOOST}")
-  FILE(DOWNLOAD ${BOOST_DOWNLOAD_URL}
-    ${WITH_BOOST}/${BOOST_TARBALL}
-    TIMEOUT ${DOWNLOAD_BOOST_TIMEOUT}
-    STATUS ERR
-    SHOW_PROGRESS
-  )
-  IF(ERR EQUAL 0)
-    SET(LOCAL_BOOST_ZIP "${WITH_BOOST}/${BOOST_TARBALL}")
-    SET(LOCAL_BOOST_ZIP "${WITH_BOOST}/${BOOST_TARBALL}" CACHE INTERNAL "")
-  ELSE()
-    MESSAGE(STATUS "Download failed, error: ${ERR}")
-    # A failed DOWNLOAD leaves an empty file, remove it
-    FILE(REMOVE ${WITH_BOOST}/${BOOST_TARBALL})
-    # STATUS returns a list of length 2
-    LIST(GET ERR 0 NUMERIC_RETURN)
-    IF(NUMERIC_RETURN EQUAL 28)
-      MESSAGE(FATAL_ERROR
-        "You can try downloading ${BOOST_DOWNLOAD_URL} manually"
-        " using curl/wget or a similar tool,"
-        " or increase the value of DOWNLOAD_BOOST_TIMEOUT"
-        " (which is now ${DOWNLOAD_BOOST_TIMEOUT} seconds)"
-      )
-    ENDIF()
-    MESSAGE(FATAL_ERROR
-      "You can try downloading ${BOOST_DOWNLOAD_URL} manually"
-      " using curl/wget or a similar tool"
-      )
-  ENDIF()
-ENDIF()
-
-IF(LOCAL_BOOST_ZIP AND NOT LOCAL_BOOST_DIR)
-  GET_FILENAME_COMPONENT(LOCAL_BOOST_DIR ${LOCAL_BOOST_ZIP} PATH)
-  IF(NOT EXISTS "${LOCAL_BOOST_DIR}/${BOOST_PACKAGE_NAME}")
-    MESSAGE(STATUS "cd ${LOCAL_BOOST_DIR}; tar xfj ${LOCAL_BOOST_ZIP}")
-    EXECUTE_PROCESS(
-      COMMAND ${CMAKE_COMMAND} -E tar xfj "${LOCAL_BOOST_ZIP}"
-      WORKING_DIRECTORY "${LOCAL_BOOST_DIR}"
-      RESULT_VARIABLE tar_result
-      )
-    IF (tar_result MATCHES 0)
-      SET(BOOST_FOUND 1 CACHE INTERNAL "")
-    ELSE()
-      MESSAGE(STATUS "WITH_BOOST ${WITH_BOOST}.")
-      MESSAGE(STATUS "Failed to extract files.\n"
-        "   Please try downloading and extracting yourself.\n"
-        "   The url is: ${BOOST_DOWNLOAD_URL}")
-      MESSAGE(FATAL_ERROR "Giving up.")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
-# Search for the version file, first in LOCAL_BOOST_DIR or WITH_BOOST
-FIND_PATH(BOOST_INCLUDE_DIR
-  NAMES boost/version.hpp
-  NO_DEFAULT_PATH
-  PATHS ${LOCAL_BOOST_DIR}
-        ${LOCAL_BOOST_DIR}/${BOOST_PACKAGE_NAME}
-        ${WITH_BOOST}
-)
-# Then search in standard places (if not found above).
-FIND_PATH(BOOST_INCLUDE_DIR
-  NAMES boost/version.hpp
-)
+# Always use the bundled version.
+SET(BOOST_SOURCE_DIR ${CMAKE_SOURCE_DIR}/extra/boost)
 
-IF(NOT BOOST_INCLUDE_DIR)
-  MESSAGE(STATUS
-    "Looked for boost/version.hpp in ${LOCAL_BOOST_DIR} and ${WITH_BOOST}")
-  COULD_NOT_FIND_BOOST()
-ELSE()
-  MESSAGE(STATUS "Found ${BOOST_INCLUDE_DIR}/boost/version.hpp ")
-ENDIF()
+# Contains all header files we need.
+# (All the directories that contain at least one needed file).
+SET(BOOST_INCLUDE_DIR ${BOOST_SOURCE_DIR}/${BOOST_PACKAGE_NAME})
 
-# Verify version number. Version information looks like:
-# //  BOOST_VERSION % 100 is the patch level
-# //  BOOST_VERSION / 100 % 1000 is the minor version
-# //  BOOST_VERSION / 100000 is the major version
-# #define BOOST_VERSION 107700
-FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp"
-  BOOST_VERSION_NUMBER
-  REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*"
-)
-STRING(REGEX REPLACE
-  "^.*BOOST_VERSION[\t ]([0-9][0-9])([0-9][0-9])([0-9][0-9]).*$" "\\1"
-  BOOST_MAJOR_VERSION "${BOOST_VERSION_NUMBER}")
-STRING(REGEX REPLACE
-  "^.*BOOST_VERSION[\t ]([0-9][0-9])([0-9][0-9])([0-9][0-9]).*$" "\\2"
-  BOOST_MINOR_VERSION "${BOOST_VERSION_NUMBER}")
-
-MESSAGE(STATUS "BOOST_VERSION_NUMBER is ${BOOST_VERSION_NUMBER}")
+# We have a limited set of patches/bugfixes here:
+SET(BOOST_PATCHES_DIR
+  "${CMAKE_SOURCE_DIR}/include/${BOOST_PACKAGE_NAME}/patches")
 
-IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
-  COULD_NOT_FIND_BOOST()
-ENDIF()
+ADD_LIBRARY(boost INTERFACE)
+ADD_LIBRARY(extra::boost ALIAS boost)
 
-IF(NOT BOOST_MINOR_VERSION EQUAL 77)
-  MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
-    "we need 77"
-    )
-  COULD_NOT_FIND_BOOST()
-ENDIF()
+TARGET_INCLUDE_DIRECTORIES(boost SYSTEM BEFORE INTERFACE
+  ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
 
+MESSAGE(STATUS "BOOST_PATCHES_DIR ${BOOST_PATCHES_DIR}")
 MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
 
-# We have a limited set of patches/bugfixes here:
-SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_77_0/patches")
-
-# Boost gets confused about language support with Clang 7 + MSVC 15.9
-IF(WIN32_CLANG)
-  ADD_DEFINITIONS(-DBOOST_NO_CXX17_HDR_STRING_VIEW)
-ENDIF()
-
-IF(LOCAL_BOOST_DIR OR LOCAL_BOOST_ZIP)
-  SET(USING_LOCAL_BOOST 1)
-ELSE()
-  SET(USING_SYSTEM_BOOST 1)
-ENDIF()
-
 IF(NOT WIN32)
-# Needed to use Boost header container_hash/hash.hpp in C++17
-  ADD_DEFINITIONS(-DBOOST_NO_CXX98_FUNCTION_BASE)
-
   FILE(GLOB_RECURSE BOOST_PATCHES_LIST
     RELATIVE ${BOOST_PATCHES_DIR}
     ${BOOST_PATCHES_DIR}/*.hpp
@@ -337,7 +52,8 @@ IF(NOT WIN32)
   FOREACH(PATCHED_FILE ${BOOST_PATCHES_LIST})
     SET(ORIGINAL_FILE_PATH "${BOOST_INCLUDE_DIR}/${PATCHED_FILE}")
     SET(PATCHED_FILE_PATH "${BOOST_PATCHES_DIR}/${PATCHED_FILE}")
-    LIST(APPEND DIFF_COMMAND_LIST "diff -u ${ORIGINAL_FILE_PATH} ${PATCHED_FILE_PATH}")
+    LIST(APPEND DIFF_COMMAND_LIST
+      "diff -u ${ORIGINAL_FILE_PATH} ${PATCHED_FILE_PATH}")
   ENDFOREACH()
   # Add true, to get zero exit status.
   LIST(APPEND DIFF_COMMAND_LIST "true")

packaging/rpm-docker/mysql.spec.in

@@ -72,7 +72,6 @@ URL:            http://www.mysql.com/
 Packager:       MySQL Release Engineering <[email protected]>
 Vendor:         %{mysql_vendor}
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
-Source1:        @BOOST_DOWNLOAD_URL@
 %if 0%{?rhel} >= 8
 BuildRequires:  cmake >= 3.6.1
 BuildRequires:  libtirpc-devel
@@ -175,7 +174,7 @@ and the manual for more information.
 This package includes the MySQL server binary as well as related utilities
 to run and administer a MySQL server.
 %prep
-%setup -q -T -a 0 -a 1 -c -n %{src_dir}
+%setup -q -T -a 0 -c -n %{src_dir}
 
 %build
 # Fail quickly and obviously if user tries to build as root
@@ -197,7 +196,6 @@ mkdir release
            -DREPRODUCIBLE_BUILD=OFF \
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	   -DWITH_BOOST=.. \
            -DCMAKE_C_FLAGS="%{optflags}" \
            -DCMAKE_CXX_FLAGS="%{optflags}" \
            -DWITH_INNODB_MEMCACHED=1 \