[#6256,#7220] Update externals

irods · Mar 5, 2024 · c4ca5b9 · c4ca5b9
1 parent 0a46ea4
commit c4ca5b9
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 50 deletions.
diff --git a/.github/workflows/build-irods-centos.yml b/.github/workflows/build-irods-centos.yml
@@ -22,19 +22,19 @@ jobs:
               wget -qO - https://unstable.irods.org/renci-irods-unstable.yum.repo | tee /etc/yum.repos.d/renci-irods-unstable.yum.repo
               yum -y update
               yum -y install \
-                irods-externals-avro1.11.0-2 \
-                irods-externals-boost1.81.0-0 \
+                irods-externals-avro-libcxx1.11.0-3 \
+                irods-externals-boost-libcxx1.81.0-1 \
                 irods-externals-catch22.13.8-0 \
                 irods-externals-clang-runtime13.0.1-0 \
                 irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
-                irods-externals-fmt8.1.1-0 \
+                irods-externals-fmt-libcxx8.1.1-1 \
                 irods-externals-json3.10.4-0 \
                 irods-externals-libarchive3.5.2-0 \
-                irods-externals-nanodbc2.13.0-1 \
-                irods-externals-spdlog1.9.2-1 \
-                irods-externals-zeromq4-14.1.8-0
+                irods-externals-nanodbc-libcxx2.13.0-2 \
+                irods-externals-spdlog-libcxx1.9.2-2 \
+                irods-externals-zeromq4-1-libcxx4.1.8-1
       - name: Configure CMake
         run:  |
               export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH

diff --git a/.github/workflows/build-irods-debian.yml b/.github/workflows/build-irods-debian.yml
@@ -21,19 +21,19 @@ jobs:
               echo "deb [arch=amd64] https://unstable.irods.org/apt/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/renci-irods-unstable.list
               apt-get update -qq
               apt-get install -qq \
-                irods-externals-avro1.11.0-2 \
-                irods-externals-boost1.81.0-0 \
+                irods-externals-avro-libcxx1.11.0-3 \
+                irods-externals-boost-libcxx1.81.0-1 \
                 irods-externals-catch22.13.8-0 \
                 irods-externals-clang-runtime13.0.1-0 \
                 irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
-                irods-externals-fmt8.1.1-0 \
+                irods-externals-fmt-libcxx8.1.1-1 \
                 irods-externals-json3.10.4-0 \
                 irods-externals-libarchive3.5.2-0 \
-                irods-externals-nanodbc2.13.0-1 \
-                irods-externals-spdlog1.9.2-1 \
-                irods-externals-zeromq4-14.1.8-0
+                irods-externals-nanodbc-libcxx2.13.0-2 \
+                irods-externals-spdlog-libcxx1.9.2-2 \
+                irods-externals-zeromq4-1-libcxx4.1.8-1
       - name: Configure CMake
         run:  |
               export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH

diff --git a/.github/workflows/build-irods-enterprise-linux-8.yml b/.github/workflows/build-irods-enterprise-linux-8.yml
@@ -25,19 +25,19 @@ jobs:
               sed -i 's/centos/el/' /etc/yum.repos.d/renci-irods-unstable.yum.repo
               dnf -y update
               dnf -y install \
-                irods-externals-avro1.11.0-2 \
-                irods-externals-boost1.81.0-0 \
+                irods-externals-avro-libcxx1.11.0-3 \
+                irods-externals-boost-libcxx1.81.0-1 \
                 irods-externals-catch22.13.8-0 \
                 irods-externals-clang-runtime13.0.1-0 \
                 irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
-                irods-externals-fmt8.1.1-0 \
+                irods-externals-fmt-libcxx8.1.1-1 \
                 irods-externals-json3.10.4-0 \
                 irods-externals-libarchive3.5.2-0 \
-                irods-externals-nanodbc2.13.0-1 \
-                irods-externals-spdlog1.9.2-1 \
-                irods-externals-zeromq4-14.1.8-0
+                irods-externals-nanodbc-libcxx2.13.0-2 \
+                irods-externals-spdlog-libcxx1.9.2-2 \
+                irods-externals-zeromq4-1-libcxx4.1.8-1
       - name: Configure CMake
         run:  |
               export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH

diff --git a/.github/workflows/build-irods-enterprise-linux-9.yml b/.github/workflows/build-irods-enterprise-linux-9.yml
@@ -26,19 +26,19 @@ jobs:
               dnf config-manager -y --set-enabled renci-irods-unstable
               dnf -y update
               dnf -y install \
-                irods-externals-avro1.11.0-2 \
-                irods-externals-boost1.81.0-0 \
+                irods-externals-avro-libcxx1.11.0-3 \
+                irods-externals-boost-libcxx1.81.0-1 \
                 irods-externals-catch22.13.8-0 \
                 irods-externals-clang-runtime13.0.1-0 \
                 irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
-                irods-externals-fmt8.1.1-0 \
+                irods-externals-fmt-libcxx8.1.1-1 \
                 irods-externals-json3.10.4-0 \
                 irods-externals-libarchive3.5.2-0 \
-                irods-externals-nanodbc2.13.0-1 \
-                irods-externals-spdlog1.9.2-1 \
-                irods-externals-zeromq4-14.1.8-0
+                irods-externals-nanodbc-libcxx2.13.0-2 \
+                irods-externals-spdlog-libcxx1.9.2-2 \
+                irods-externals-zeromq4-1-libcxx4.1.8-1
       - name: Configure CMake
         run:  |
               export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH

diff --git a/.github/workflows/build-irods-ubuntu.yml b/.github/workflows/build-irods-ubuntu.yml
@@ -28,19 +28,19 @@ jobs:
               echo "deb [arch=amd64] https://unstable.irods.org/apt/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/renci-irods-unstable.list
               apt-get update -qq
               apt-get install -qq \
-                irods-externals-avro1.11.0-2 \
-                irods-externals-boost1.81.0-0 \
+                irods-externals-avro-libcxx1.11.0-3 \
+                irods-externals-boost-libcxx1.81.0-1 \
                 irods-externals-catch22.13.8-0 \
                 irods-externals-clang-runtime13.0.1-0 \
                 irods-externals-clang13.0.1-0 \
                 irods-externals-cmake3.21.4-0 \
                 irods-externals-cppzmq4.8.1-1 \
-                irods-externals-fmt8.1.1-0 \
+                irods-externals-fmt-libcxx8.1.1-1 \
                 irods-externals-json3.10.4-0 \
                 irods-externals-libarchive3.5.2-0 \
-                irods-externals-nanodbc2.13.0-1 \
-                irods-externals-spdlog1.9.2-1 \
-                irods-externals-zeromq4-14.1.8-0
+                irods-externals-nanodbc-libcxx2.13.0-2 \
+                irods-externals-spdlog-libcxx1.9.2-2 \
+                irods-externals-zeromq4-1-libcxx4.1.8-1
       - name: Configure CMake
         run:  |
               export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH

diff --git a/.github/workflows/linter-irods-clang-tidy.yml b/.github/workflows/linter-irods-clang-tidy.yml
@@ -48,19 +48,19 @@ jobs:
                   echo "deb [arch=amd64] https://unstable.irods.org/apt/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/renci-irods-unstable.list
                   sudo apt-get update -qq
                   sudo apt-get install -qq \
-                    irods-externals-avro1.11.0-2 \
-                    irods-externals-boost1.81.0-0 \
+                    irods-externals-avro-libcxx1.11.0-3 \
+                    irods-externals-boost-libcxx1.81.0-1 \
                     irods-externals-catch22.13.8-0 \
                     irods-externals-clang-runtime13.0.1-0 \
                     irods-externals-clang13.0.1-0 \
                     irods-externals-cmake3.21.4-0 \
                     irods-externals-cppzmq4.8.1-1 \
-                    irods-externals-fmt8.1.1-0 \
+                    irods-externals-fmt-libcxx8.1.1-1 \
                     irods-externals-json3.10.4-0 \
                     irods-externals-libarchive3.5.2-0 \
-                    irods-externals-nanodbc2.13.0-1 \
-                    irods-externals-spdlog1.9.2-1 \
-                    irods-externals-zeromq4-14.1.8-0
+                    irods-externals-nanodbc-libcxx2.13.0-2 \
+                    irods-externals-spdlog-libcxx1.9.2-2 \
+                    irods-externals-zeromq4-1-libcxx4.1.8-1
             - name: Configure CMake
               run: |
                   export PATH=/opt/irods-externals/cmake3.21.4-0/bin:$PATH

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,18 +16,6 @@ endif()
 include(IrodsExternals)
 include(IrodsCXXCompiler)
 
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(ARCHIVE libarchive3.5.2-0)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(AVRO avro1.11.0-2)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(BOOST boost1.81.0-0)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(FMT fmt8.1.1-0)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(NANODBC nanodbc2.13.0-1)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(ZMQ zeromq4-14.1.8-0)
-
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(CATCH2 catch22.13.8-0)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(CPPZMQ cppzmq4.8.1-1)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(JSON json3.10.4-0)
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(SPDLOG spdlog1.9.2-1)
-
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(IRODS_CXX_STANDARD "${CMAKE_CXX_STANDARD}")
@@ -84,6 +72,37 @@ project(irods
   VERSION ${IRODS_VERSION}
   LANGUAGES C CXX)
 
+# This is duplicated from UseLibCXX.cmake, since we need it before UseLibCXX can be included.
+if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+  set(IRODS_BUILD_AGAINST_LIBCXX_DEFAULT ON)
+else()
+  set(IRODS_BUILD_AGAINST_LIBCXX_DEFAULT OFF)
+endif()
+set(IRODS_BUILD_AGAINST_LIBCXX ${IRODS_BUILD_AGAINST_LIBCXX_DEFAULT} CACHE BOOL "Try to build against libc++ instead of libstdc++.")
+
+# NOTE: At present, our split externals packages have parity. Should this ever change, support for automatically
+# switching externals packages based on IRODS_BUILD_AGAINST_LIBCXX should be removed.
+if (IRODS_BUILD_AGAINST_LIBCXX)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(AVRO avro-libcxx1.11.0-3)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(BOOST boost-libcxx1.81.0-1)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(FMT fmt-libcxx8.1.1-1)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(NANODBC nanodbc-libcxx2.13.0-2)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(ZMQ zeromq4-1-libcxx4.1.8-1)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(SPDLOG spdlog-libcxx1.9.2-2)
+else()
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(AVRO avro1.11.0-3)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(BOOST boost1.81.0-1)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(FMT fmt8.1.1-1)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(NANODBC nanodbc2.13.0-2)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(ZMQ zeromq4-14.1.8-1)
+  IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(SPDLOG spdlog1.9.2-2)
+endif()
+
+IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(ARCHIVE libarchive3.5.2-0)
+IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(CATCH2 catch22.13.8-0)
+IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(CPPZMQ cppzmq4.8.1-1)
+IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_DEVELOP_DEPENDENCIES_LIST(JSON json3.10.4-0)
+
 include(ObjectTargetHelpers)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)

diff --git a/lib/core/CMakeLists.txt b/lib/core/CMakeLists.txt
@@ -79,7 +79,7 @@ target_link_libraries(
   PUBLIC
   nlohmann_json::nlohmann_json
   fmt::fmt
-  spdlog::spdlog_header_only
+  spdlog::spdlog
   Threads::Threads
 )
 target_include_directories(
@@ -236,7 +236,7 @@ foreach(variant IN ITEMS client server)
     PUBLIC
     nlohmann_json::nlohmann_json
     fmt::fmt
-    spdlog::spdlog_header_only
+    spdlog::spdlog
     OpenSSL::Crypto
     OpenSSL::SSL
   )