17.0.0.dev0

.ci_support/linux_64_variantdefault.yaml

@@ -7,14 +7,18 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:
 - '13'
+libxml2:
+- '2.11'
 target_platform:
 - linux-64
 variant:
 - default
 zlib:
 - '1.2'
+zstd:
+- '1.5'

.ci_support/linux_aarch64_variantdefault.yaml

@@ -11,14 +11,18 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:
 - '13'
+libxml2:
+- '2.11'
 target_platform:
 - linux-aarch64
 variant:
 - default
 zlib:
 - '1.2'
+zstd:
+- '1.5'

.ci_support/linux_ppc64le_variantdefault.yaml

@@ -7,14 +7,18 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:
 - '13'
+libxml2:
+- '2.11'
 target_platform:
 - linux-ppc64le
 variant:
 - default
 zlib:
 - '1.2'
+zstd:
+- '1.5'

.ci_support/migrations/libxml2211.yaml

@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+libxml2:
+- '2.11'
+migrator_ts: 1684203491.9767957

.ci_support/osx_64_.yaml

@@ -7,12 +7,18 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '14'
+- '15'
 libclang_soversion:
 - '13'
+libxml2:
+- '2.11'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 target_platform:
 - osx-64
 variant:
 - default
+zlib:
+- '1.2'
+zstd:
+- '1.5'

.ci_support/osx_arm64_.yaml

@@ -7,12 +7,18 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '14'
+- '15'
 libclang_soversion:
 - '13'
+libxml2:
+- '2.11'
 macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:
 - osx-arm64
 variant:
 - default
+zlib:
+- '1.2'
+zstd:
+- '1.5'

.ci_support/win_64_.yaml

@@ -6,9 +6,13 @@ cxx_compiler:
 - vs2019
 libclang_soversion:
 - '13'
+libxml2:
+- '2.11'
 target_platform:
 - win-64
 variant:
 - default
 zlib:
 - '1.2'
+zstd:
+- '1.5'

conda-forge.yml

@@ -1,13 +1,20 @@
-provider:
-  win: azure
-conda_forge_output_validation: true
+bot:
+  abi_migration_branches:
+  - 15.x
+  - 14.x
 build_platform:
-  linux_ppc64le: linux_64
   linux_aarch64: linux_64
+  linux_ppc64le: linux_64
   osx_arm64: osx_64
-test_on_native_only: true
+# label/llvm_rc would overrule our default compiler stack on osx due to
+# strict channel priority; disable for rc-phase; don't commit to main!
+channel_priority: flexible
+conda_build:
+  pkg_format: '2'
+conda_forge_output_validation: true
 github:
   branch_name: main
   tooling_branch_name: main
-conda_build:
-  pkg_format: '2'
+provider:
+  win: azure
+test_on_native_only: true

recipe/bld.bat

@@ -3,15 +3,15 @@
 :: move clang-tools-extra to clang/tools/extra, see
 :: https://github.com/llvm/llvm-project/blob/main/clang-tools-extra/README.txt
 mkdir llvm-project\clang\tools\extra
-robocopy llvm-project\clang-tools-extra llvm-project\clang\tools\extra /E
+robocopy llvm-project\clang-tools-extra llvm-project\clang\tools\extra /E >nul
 :: do not check %ERRORLEVEL%! robocopy returns an exit code
 :: of 1 if one or more files were successfully copied.
 
 :: using subproject sources has been effectively broken in LLVM 14,
 :: so we use the entire project, but make sure we don't pick up
 :: anything in-tree other than clang & the shared cmake folder
-robocopy llvm-project\clang .\clang /E
-robocopy llvm-project\cmake .\cmake /E
+robocopy llvm-project\clang .\clang /E >nul
+robocopy llvm-project\cmake .\cmake /E >nul
 del /f /q llvm-project
 cd clang
 
@@ -34,7 +34,9 @@ cmake -G "Ninja" ^
     -DCLANG_INCLUDE_DOCS=OFF ^
     -DLLVM_INCLUDE_TESTS=OFF ^
     -DLLVM_INCLUDE_DOCS=OFF ^
-    -DLLVM_ENABLE_LIBXML2=OFF ^
+    -DLLVM_ENABLE_LIBXML2=FORCE_ON ^
+    -DLLVM_ENABLE_ZLIB=FORCE_ON ^
+    -DLLVM_ENABLE_ZSTD=FORCE_ON ^
     -DPython3_EXECUTABLE=%BUILD_PREFIX%\python ^
     ..
 if %ERRORLEVEL% neq 0 exit 1

recipe/build.sh

@@ -15,8 +15,12 @@ rm -rf llvm-project
 cd clang
 
 IFS='.' read -r -a PKG_VER_ARRAY <<< "${PKG_VERSION}"
+VER_MAJOR=${PKG_VER_ARRAY[0]}
+if [[ "${PKG_VERSION}" == *dev0 ]]; then
+    SOVER_EXT="${VER_MAJOR}git"
+fi
 
-sed -i.bak "s/libLTO.dylib/libLTO.${PKG_VER_ARRAY[0]}.dylib/g" lib/Driver/ToolChains/Darwin.cpp
+sed -i.bak "s/libLTO.dylib/libLTO.${SOVER_EXT}.dylib/g" lib/Driver/ToolChains/Darwin.cpp
 
 if [[ "$variant" == "hcc" ]]; then
   CMAKE_ARGS="$CMAKE_ARGS -DKALMAR_BACKEND=HCC_BACKEND_AMDGPU -DHCC_VERSION_STRING=2.7-19365-24e69cd8-24e69cd8-24e69cd8"
@@ -25,8 +29,11 @@ if [[ "$variant" == "hcc" ]]; then
 fi
 
 if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
+  NATIVE_FLAGS="-DCMAKE_C_COMPILER=$CC_FOR_BUILD;-DCMAKE_CXX_COMPILER=$CXX_FOR_BUILD;-DCMAKE_C_FLAGS=-O2;-DCMAKE_CXX_FLAGS=-O2"
+  NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_EXE_LINKER_FLAGS=;-DCMAKE_MODULE_LINKER_FLAGS=;-DCMAKE_SHARED_LINKER_FLAGS="
+  NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_STATIC_LINKER_FLAGS=;-DCMAKE_PREFIX_PATH=$BUILD_PREFIX"
+  CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=${NATIVE_FLAGS}"
   CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_TOOLS_BINARY_DIR=$BUILD_PREFIX/bin -DNATIVE_LLVM_DIR=$BUILD_PREFIX/lib/cmake/llvm"
-  CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_C_COMPILER=$CC_FOR_BUILD;-DCMAKE_CXX_COMPILER=$CXX_FOR_BUILD;-DCMAKE_C_FLAGS=-O2;-DCMAKE_CXX_FLAGS=-O2;-DCMAKE_EXE_LINKER_FLAGS=;-DCMAKE_MODULE_LINKER_FLAGS=;-DCMAKE_SHARED_LINKER_FLAGS=;-DCMAKE_STATIC_LINKER_FLAGS=;-DZLIB_ROOT=$BUILD_PREFIX"
 else
   rm -rf $BUILD_PREFIX/bin/llvm-tblgen
 fi
@@ -54,7 +61,9 @@ cmake \
   -DCLANG_INCLUDE_DOCS=OFF \
   -DLLVM_INCLUDE_TESTS=OFF \
   -DLLVM_INCLUDE_DOCS=OFF \
-  -DLLVM_ENABLE_LIBXML2=OFF \
+  -DLLVM_ENABLE_LIBXML2=FORCE_ON \
+  -DLLVM_ENABLE_ZLIB=FORCE_ON \
+  -DLLVM_ENABLE_ZSTD=FORCE_ON \
   -DLLVM_ENABLE_RTTI=ON \
   -DCMAKE_AR=$AR \
   -DPython3_EXECUTABLE=${BUILD_PREFIX}/bin/python \

recipe/install_clang.sh

@@ -3,20 +3,3 @@ set -ex
 
 cd ${SRC_DIR}/clang/build
 make install
-
-cd "${PREFIX}"
-rm -rf libexec share include
-
-mv bin bin2
-mkdir -p bin
-
-maj_version="${PKG_VERSION%%.*}"
-cp bin2/clang-${maj_version} bin/
-rm -rf bin2
-
-mv lib lib2
-mkdir -p lib
-mv lib2/libclang-cpp.* lib/
-rm lib/libclang-cpp${SHLIB_EXT}
-cp -Rf lib2/clang lib/
-rm -rf lib2

recipe/install_clang_format.bat

@@ -3,12 +3,3 @@
 cd %SRC_DIR%\clang\build
 ninja install
 if %ERRORLEVEL% neq 0 exit 1
-
-cd %LIBRARY_PREFIX%
-rmdir /s /q lib libexec share include
-
-move bin bin2
-mkdir bin
-
-move bin2\clang-format.exe bin\clang-format.exe
-rmdir /s /q bin2

recipe/install_clang_format.sh

@@ -4,15 +4,8 @@ set -ex
 cd ${SRC_DIR}/clang/build
 make install
 
-cd $PREFIX
-rm -rf lib/cmake include lib/lib*.a libexec share
-
-mv bin bin2
-mkdir -p bin
-
 MAJOR_VERSION=$(echo ${PKG_VERSION} | cut -f1 -d".")
-cp bin2/clang-format bin/clang-format-${MAJOR_VERSION}
-rm -rf bin2
+mv ${PREFIX}/bin/clang-format ${PREFIX}/bin/clang-format-${MAJOR_VERSION}
 
 if [[ "$PKG_NAME" == "clang-format" ]]; then
   ln -sf $PREFIX/bin/clang-format-${MAJOR_VERSION} $PREFIX/bin/clang-format

recipe/install_clang_tools.bat

@@ -5,4 +5,4 @@ ninja install
 if %ERRORLEVEL% neq 0 exit 1
 
 cd %LIBRARY_PREFIX%
-rmdir /s /q lib include
+rmdir /s /q include\clang include\clang-c include\clang-tidy lib

recipe/install_clang_tools.sh

@@ -4,18 +4,29 @@ set -ex
 cd ${SRC_DIR}/clang/build
 make install
 cd $PREFIX
-rm -rf lib/cmake include lib/lib*.a
+
+# Remove stuff that should be in clangdev
+rm -rf include/clang
+rm -rf include/clang-c
+rm -rf include/clang-tidy
+rm -rf lib/cmake/clang/
+rm -rf lib/lib*.a
 
 MAJOR_VERSION=$(echo ${PKG_VERSION} | cut -f1 -d".")
 for f in ${PREFIX}/bin/clang-*; do
     if [[ "$(basename $f)" == clang-format-* ]]; then
+        # already got versioned in install_clang_format.sh
+        continue
+    elif [[ "$(basename $f)" == "clang-${MAJOR_VERSION}" ]]; then
+        # installation also creates a versioned clang, no need to re-version it
         continue
     fi
     rm -f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION}
     mv $f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION};
     ln -s ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION} $f;
 done
 
-rm ${PREFIX}/bin/clang-${MAJOR_VERSION}-${MAJOR_VERSION}
+# part of output "clang", not "clang-tools"
+rm ${PREFIX}/bin/clang-${MAJOR_VERSION}
 rm ${PREFIX}/bin/clang-cpp-${MAJOR_VERSION}
 rm ${PREFIX}/bin/clang-cl-${MAJOR_VERSION}

recipe/install_libclang.bat

@@ -3,24 +3,3 @@
 cd %SRC_DIR%\clang\build
 ninja install
 if %ERRORLEVEL% neq 0 exit 1
-
-cd %LIBRARY_PREFIX%
-rmdir /s /q libexec share include
-
-move bin bin2
-mkdir bin
-move lib lib2
-mkdir lib
-
-setlocal enabledelayedexpansion
-if "%PKG_NAME%"=="libclang" (
-    REM for unversioned output, keep only import lib; no DLLs
-    move lib2\libclang.lib lib\libclang.lib
-    if %ERRORLEVEL% neq 0 exit 1
-) else (
-    REM for versioned output, keep only versioned DLL; no import lib
-    move bin2\libclang-%libclang_soversion%.dll bin\libclang-%libclang_soversion%.dll
-    if %ERRORLEVEL% neq 0 exit 1
-)
-rmdir /s /q bin2
-rmdir /s /q lib2

recipe/install_libclang.sh

@@ -3,15 +3,3 @@ set -ex
 
 cd ${SRC_DIR}/clang/build
 make install
-
-cd $PREFIX
-rm -rf libexec share bin include
-mv lib lib2
-mkdir lib
-
-if [[ "$PKG_NAME" == "libclang" ]]; then
-    mv lib2/${PKG_NAME}${SHLIB_EXT} lib/
-else
-    mv lib2/libclang.*.* lib/
-fi
-rm -rf lib2