Merge pull request #76613 from finagolfin/link-icu

[6.0.x] Remove libicu build and update list of Swift runtime libraries to be de-duplicated

Author: DougGregor

lib/DriverTool/autolink_extract_main.cpp

@@ -228,7 +228,7 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
       "-lswiftCore",
       "-lswift_Concurrency",
       "-lswift_StringProcessing",
-      "-lswift_RegexBuilder",
+      "-lswiftRegexBuilder",
       "-lswift_RegexParser",
       "-lswift_Backtracing",
       "-lswiftSynchronization",
@@ -250,12 +250,9 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
       "-lcurl",
       "-lxml2",
       "-luuid",
+      "-lTesting",
       // XCTest runtime libs (must be first due to http://github.com/apple/swift-corelibs-xctest/issues/432)
       "-lXCTest",
-      // ICU Swift runtime libs
-      "-licui18nswift",
-      "-licuucswift",
-      "-licudataswift",
       // Common-use ordering-agnostic Linux system libs
       "-lm",
       "-lpthread",

utils/build-presets.ini

@@ -842,7 +842,6 @@ swift-driver
 swift-testing
 swift-testing-macros
 xctest
-libicu
 swiftdocc
 swiftformat
 
@@ -858,7 +857,6 @@ install-swiftsyntax
 install-swift-testing
 install-swift-testing-macros
 install-xctest
-install-libicu
 install-prefix=/usr
 install-sourcekit-lsp
 install-swiftformat
@@ -954,7 +952,6 @@ skip-test-xctest
 skip-test-foundation
 skip-test-libdispatch
 skip-test-playgroundsupport
-skip-test-libicu
 skip-test-indexstore-db
 skip-test-sourcekit-lsp
 skip-test-swiftdocc
@@ -1181,7 +1178,6 @@ mixin-preset=
     mixin_linux_install_components_with_clang
 build-subdir=buildbot_incremental
 
-libicu
 llbuild
 swiftpm
 swift-driver
@@ -1199,7 +1195,6 @@ install-llvm
 install-static-linux-config
 install-swift
 install-llbuild
-install-libicu
 install-swiftpm
 install-swift-driver
 install-swiftsyntax
@@ -1779,7 +1774,6 @@ skip-test-osx
 llvm-cmake-options=-DCLANG_DEFAULT_LINKER=gold
 
 foundation
-libicu
 libdispatch
 test
 
@@ -1823,17 +1817,14 @@ mixin-preset=
     mixin_linux_install_components_with_clang
 
 libdispatch
-libicu
 foundation
 xctest
 libcxx=false
 
-install-libicu
 install-foundation
 install-libdispatch
 install-xctest
 
-skip-test-libicu
 skip-test-foundation
 skip-test-libdispatch
 skip-test-xctest
@@ -2104,7 +2095,6 @@ mixin-preset=buildbot_indexstoredb_linux,sanitize
 mixin-preset=
     mixin_linux_install_components_with_clang
 
-libicu
 llbuild
 swiftpm
 xctest
@@ -2120,7 +2110,6 @@ reconfigure
 
 install-foundation
 install-libdispatch
-install-libicu
 install-libcxx
 install-llvm
 install-static-linux-config
@@ -3047,7 +3036,6 @@ mixin-preset=
 [preset: linux_lldb]
 lldb
 foundation
-libicu
 libdispatch
 build-ninja
 

utils/build-script-impl

@@ -299,7 +299,6 @@ components=(
   foundation
   libcxx
   libdispatch
-  libicu
   libxml2
   zlib
   curl
@@ -1260,15 +1259,13 @@ FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-foundation"
 FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR="${WORKSPACE}/swift-foundation-icu"
 LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
 LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
-LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
 LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes"
 SWIFT_COLLECTIONS_SOURCE_DIR="${WORKSPACE}/swift-collections"
 SWIFT_PATH_TO_STRING_PROCESSING_SOURCE="${WORKSPACE}/swift-experimental-string-processing"
 SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
 SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
 
 [[ "${SKIP_BUILD_LIBCXX}" ]] || PRODUCTS+=(libcxx)
-[[ "${SKIP_BUILD_LIBICU}" ]] || PRODUCTS+=(libicu)
 [[ "${SKIP_BUILD_SWIFT}" ]] || PRODUCTS+=(swift)
 [[ "${SKIP_BUILD_LLDB}" ]] || PRODUCTS+=(lldb)
 [[ "${SKIP_BUILD_LIBDISPATCH}" ]] || PRODUCTS+=(libdispatch)
@@ -1357,8 +1354,6 @@ function build_directory_bin() {
             libdispatch|libdispatch_static)
                 echo "${root}/${LIBDISPATCH_BUILD_TYPE}/bin"
                 ;;
-            libicu)
-                ;;
             *)
                 echo "error: unknown product: ${product}"
                 exit 1
@@ -1497,8 +1492,6 @@ function cmake_config_opt() {
             libdispatch|libdispatch_static)
                 echo "--config ${LIBDISPATCH_BUILD_TYPE}"
                 ;;
-            libicu)
-                ;;
             *)
                 echo "error: unknown product: ${product}"
                 exit 1
@@ -2462,29 +2455,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     continue
                 fi
 
-                if [[ ! "${SKIP_BUILD_LIBICU}" ]] ; then
-                    ICU_ROOT=$(build_directory ${host} libicu)/tmp_install
-                    ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
-                    LIBICU_BUILD_ARGS=(
-                        -DICU_ROOT:PATH=${ICU_ROOT}
-                        -DICU_INCLUDE_DIR:PATH=${ICU_ROOT}/include
-                        -DICU_DATA_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
-                        -DICU_DATA_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
-                        -DICU_DATA_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
-                        -DICU_DATA_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicudataswift.so
-                        -DICU_UC_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
-                        -DICU_UC_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
-                        -DICU_UC_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
-                        -DICU_UC_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicuucswift.so
-                        -DICU_I18N_LIBRARIES:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so
-                        -DICU_I18N_LIBRARY:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so
-                        -DICU_I18N_LIBRARY_DEBUG:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so
-                        -DICU_I18N_LIBRARY_RELEASE:FILEPATH=${ICU_LIBDIR}/libicui18nswift.so
-                    )
-                else
-                    LIBICU_BUILD_ARGS=()
-                fi
-
                 if [[ ! "${SKIP_BUILD_LIBXML2}" ]]; then
                     BASE_INSTALL_DIR="$(get_host_install_destdir ${host})"
                     LIBXML2_HEADERS="${BASE_INSTALL_DIR}/usr/include/libxml2"
@@ -2548,12 +2518,6 @@ for host in "${ALL_HOSTS[@]}"; do
                   call rm -rf "${build_dir}"
                 fi
 
-                # Set the PKG_CONFIG_PATH so that core-foundation can find the libraries and
-                # header files
-                LIBICU_BUILD_DIR="$(build_directory ${host} libicu)"
-                export PKG_CONFIG_PATH="${LIBICU_BUILD_DIR}/config:${PKG_CONFIG_PATH}"
-                export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}":"${LIBICU_BUILD_DIR}/lib"
-
                 cmake_options=(
                   ${cmake_options[@]}
                   -DCMAKE_BUILD_TYPE:STRING=${FOUNDATION_BUILD_TYPE}
@@ -2564,8 +2528,6 @@ for host in "${ALL_HOSTS[@]}"; do
                   -DCMAKE_Swift_FLAGS:STRING="$(common_swift_flags)"
                   -DCMAKE_INSTALL_PREFIX:PATH=$(get_host_install_prefix ${host})
 
-                  ${LIBICU_BUILD_ARGS[@]}
-
                   ${LIBXML2_BUILD_ARGS[@]}
 
                   ${ZLIB_BUILD_ARGS[@]}
@@ -2593,7 +2555,7 @@ for host in "${ALL_HOSTS[@]}"; do
                 if [[ $(is_cross_tools_host ${host}) ]] ; then
                     cmake_options+=("${SWIFT_TARGET_CMAKE_OPTIONS[@]}")
 
-                    # Foundation looks for the ICU, libXML2 and libcurl libraries
+                    # Foundation looks for the libXML2 and libcurl libraries
                     # using find_package(), so search for them in
                     # CROSS_COMPILE_DEPS_PATH using the CMake process for doing
                     # so, see the linked CMake docs for more info:
@@ -2653,62 +2615,6 @@ for host in "${ALL_HOSTS[@]}"; do
                 ;;
                 esac
 
-                ;;
-            libicu)
-                SWIFT_BUILD_PATH=$(build_directory ${host} swift)
-                LIBICU_BUILD_DIR=$(build_directory ${host} ${product})
-                ICU_TMPINSTALL=$LIBICU_BUILD_DIR/tmp_install
-                ICU_TMPLIBDIR="${SWIFT_BUILD_PATH}/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
-                if [[ "${RECONFIGURE}" || ! -f "${LIBICU_BUILD_DIR}"/config.status ]]; then
-                    echo "Reconfiguring libicu"
-                    if [[ "$LIBICU_BUILD_TYPE" != "Release" ]] ; then
-                        libicu_enable_debug="--enable-debug"
-                    else
-                        libicu_enable_debug=""
-                    fi
-                    call mkdir -p "${LIBICU_BUILD_DIR}"
-
-                    if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then
-                          libicu_enable_static="--enable-static"
-                    else
-                          libicu_enable_static=""
-                    fi
-
-                    with_pushd "${LIBICU_BUILD_DIR}" \
-                        call env CXXFLAGS=-fPIC LDFLAGS='-Wl,-rpath=\$$ORIGIN' \
-                        "${LIBICU_SOURCE_DIR}"/icu4c/source/runConfigureICU Linux \
-                        ${icu_build_variant_arg} --prefix=${ICU_TMPINSTALL} \
-                        ${libicu_enable_debug} \
-                        --enable-renaming --with-library-suffix=swift \
-                        --libdir=${ICU_TMPLIBDIR} \
-                        --enable-shared --enable-static \
-                        --enable-strict --disable-icuio \
-                        --disable-plugins --disable-dyload --disable-extras \
-                        --disable-samples --disable-layoutex --with-data-packaging=auto
-                else
-                    echo "Skipping reconfiguration of libicu"
-                fi
-                with_pushd "${LIBICU_BUILD_DIR}" \
-                    call make -j ${BUILD_JOBS} install
-                ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
-                ICU_LIBDIR_STATIC="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}"
-                ICU_LIBDIR_STATIC_ARCH="$(build_directory ${host} swift)/lib/swift_static/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
-                # Add in the ICU renaming config into uconfig.h
-                call sed -e "/^#define __UCONFIG_H__/ r ${LIBICU_BUILD_DIR}/uconfig.h.prepend" -i ${ICU_TMPINSTALL}/include/unicode/uconfig.h
-
-                if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then
-                    # Copy the static libs into the swift_static directory
-                    call mkdir -p "${ICU_LIBDIR_STATIC_ARCH}"
-                    for l in uc i18n data
-                    do
-                        lib="${ICU_LIBDIR}/libicu${l}swift.a"
-                        call cp "${lib}" "${ICU_LIBDIR_STATIC}"
-                        call cp "${lib}" "${ICU_LIBDIR_STATIC_ARCH}"
-                    done
-                fi
-
-                # libicu builds itself and doesn't use cmake
-                continue
                 ;;
             *)
                 echo "error: unknown product: ${product}"
@@ -2989,17 +2895,6 @@ for host in "${ALL_HOSTS[@]}"; do
               # libdispatch_static
               continue
             ;;
-            libicu)
-                if [[ "${SKIP_TEST_LIBICU}" ]]; then
-                    continue
-                fi
-                LIBICU_BUILD_DIR=$(build_directory ${host} ${product})
-                echo "--- Running tests for ${product} ---"
-                with_pushd "${LIBICU_BUILD_DIR}/test" \
-                    call make -j ${BUILD_JOBS}
-                echo "--- Finished tests for ${product} ---"
-                continue
-                ;;
             *)
                 echo "error: unknown product: ${product}"
                 exit 1
@@ -3178,42 +3073,6 @@ for host in "${ALL_HOSTS[@]}"; do
                 ;;
                 esac
                 ;;
-            libicu)
-                if [[ -z "${INSTALL_LIBICU}" ]]; then
-                    continue
-                fi
-                echo "--- Installing ${product} ---"
-                ICU_BUILD_DIR=$(build_directory ${host} ${product})
-                ICU_INSTALL_DIR="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"
-                ICU_LIBDIR="$(build_directory ${host} swift)/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
-                LIBICU_DEST_DIR="${ICU_INSTALL_DIR}lib/swift/${SWIFT_HOST_VARIANT}"
-                call mkdir -p ${LIBICU_DEST_DIR}
-
-                for l in uc i18n data
-                do
-                    lib=${ICU_LIBDIR}/libicu${l}swift
-                    echo "${lib} => ${LIBICU_DEST_DIR}"
-                    call cp -d ${lib}.so ${lib}.so.* ${LIBICU_DEST_DIR}
-                done
-
-                if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then
-                    LIBICU_DEST_DIR_STATIC="${ICU_INSTALL_DIR}lib/swift_static/${SWIFT_HOST_VARIANT}"
-                    call mkdir -p ${LIBICU_DEST_DIR_STATIC}
-                    for l in uc i18n data
-                    do
-                        lib=${ICU_LIBDIR}/libicu${l}swift
-                        echo "${lib} => ${LIBICU_DEST_DIR_STATIC}"
-                        call cp -d ${lib}.a ${LIBICU_DEST_DIR_STATIC}
-                    done
-                fi
-
-                ICU_TMP_INSTALL_DIR="${ICU_BUILD_DIR}/tmp_install"
-                call mkdir -p  "${ICU_INSTALL_DIR}include"
-                call cp -a "${ICU_TMP_INSTALL_DIR}/include/unicode" "${ICU_INSTALL_DIR}include"
-                call mkdir -p "${ICU_INSTALL_DIR}share/icuswift"
-                call cp -a "${ICU_TMP_INSTALL_DIR}/share/icuswift" "${ICU_INSTALL_DIR}share"
-                continue
-                ;;
             *)
                 echo "error: unknown product: ${product}"
                 exit 1