diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6894cd14..a59d6834 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -23,11 +23,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/README.md b/README.md index aa25898b..856de467 100644 --- a/README.md +++ b/README.md @@ -84,15 +84,15 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang-green.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--16-green.svg)](https://anaconda.org/conda-forge/clang-16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-16.svg)](https://anaconda.org/conda-forge/clang-16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-16.svg)](https://anaconda.org/conda-forge/clang-16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-16.svg)](https://anaconda.org/conda-forge/clang-16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--17-green.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format-green.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--16-green.svg)](https://anaconda.org/conda-forge/clang-format-16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-16.svg)](https://anaconda.org/conda-forge/clang-format-16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-16.svg)](https://anaconda.org/conda-forge/clang-format-16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-16.svg)](https://anaconda.org/conda-forge/clang-format-16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--17-green.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--tools-green.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangdev-green.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx-green.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang-green.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp-green.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp16-green.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp16.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp16.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp16.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp17-green.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang13-green.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python--clang-green.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | @@ -106,16 +106,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `clang, clang-16, clang-format, clang-format-16, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp16, libclang13, python-clang` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `clang, clang-17, clang-format, clang-format-17, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp17, libclang13, python-clang` can be installed with `conda`: ``` -conda install clang clang-16 clang-format clang-format-16 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp16 libclang13 python-clang +conda install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang ``` or with `mamba`: ``` -mamba install clang clang-16 clang-format clang-format-16 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp16 libclang13 python-clang +mamba install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang ``` It is possible to list all of the versions of `clang` available on your platform with `conda`: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8701ea45..8254f63e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.dev0" %} +{% set version = "17.0.0.rc1" %} {% set major_version = version.split(".")[0] %} {% set build_number = 0 %} @@ -18,21 +18,18 @@ package: version: {{ version }} source: - - url: https://github.com/llvm/llvm-project/archive/a4f4d82c35b80b681687b545200456e79a82d9c2.tar.gz - sha256: 900eeba6c46ed73594cf5b7fb6d32f29a29fcec34c644140f24b6435afbccf07 - # - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - # sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e + - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz + sha256: 01b80625c131b8281dcf76a4e6395d10f45835c60e27357c92abf5a98c9a0337 patches: - - patches/0001-Find-conda-gcc-installation.patch - - patches/0002-Fix-sysroot-detection-for-linux.patch - - patches/0003-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch - - patches/0004-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch - - patches/0005-Set-VERSION-in-osx-as-well.patch - - patches/0006-Fix-crosscompiling-LLVM-tools.patch + - patches/0001-Fix-sysroot-detection-for-linux.patch + - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch + - patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch + - patches/0004-Set-VERSION-in-osx-as-well.patch + - patches/0005-Fix-crosscompiling-LLVM-tools.patch # Disable -Werror,-Wundef-prefix=TARGET_OS as they are not yet defined in the 10.9 SDK used for osx-64 # Only enable it for TARGET_OS_OSX. - - patches/0007-Only-error-on-undefined-TARGET_OS_OSX.patch # [osx and x86_64] - - patches/0008-set-libclang-SOVERSION-unconditionally.patch + - patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch # [osx and x86_64] + - patches/0007-set-libclang-SOVERSION-unconditionally.patch # check out git history before LLVM 16 for these patches # - patches/amd-roc-2.7.0.diff # [variant != "hcc"] # - patches/amd-roc-hcc-2.7.0.diff # [variant == "hcc"] @@ -441,6 +438,9 @@ outputs: commands: - clang++ --version - clang++ -v -c mytest.cxx + - unset CONDA_BUILD_SYSROOT # [unix] + - set "CONDA_BUILD_SYSROOT=" # [win] + - clang++ -v -c mytest.cxx - name: clang-format-{{ major_version }} script: install_clang_format.sh # [unix] diff --git a/recipe/patches/0001-Find-conda-gcc-installation.patch b/recipe/patches/0001-Find-conda-gcc-installation.patch deleted file mode 100644 index e18d3a36..00000000 --- a/recipe/patches/0001-Find-conda-gcc-installation.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5140cf31ba7d8c402d4259b7a1daba39be056821 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 8 Apr 2019 16:20:03 -0500 -Subject: [PATCH 1/8] Find conda gcc installation - ---- - clang/lib/Driver/ToolChains/Gnu.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp -index 4c08c61eb07..af69402f38b 100644 ---- a/clang/lib/Driver/ToolChains/Gnu.cpp -+++ b/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -2302,7 +2302,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; - static const char *const AArch64Triples[] = { - "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", -- "aarch64-suse-linux"}; -+ "aarch64-suse-linux", "aarch64-conda_cos7-linux-gnu", "aarch64-conda-linux-gnu"}; - static const char *const AArch64beLibDirs[] = {"/lib"}; - static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", - "aarch64_be-linux-gnu"}; -@@ -2332,7 +2332,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - "x86_64-redhat-linux", "x86_64-suse-linux", - "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", - "x86_64-slackware-linux", "x86_64-unknown-linux", -- "x86_64-amazon-linux"}; -+ "x86_64-amazon-linux", "x86_64-conda_cos6-linux-gnu", -+ "x86_64-conda_cos7-linux-gnu", "x86_64-conda-linux-gnu"}; - static const char *const X32Triples[] = {"x86_64-linux-gnux32", - "x86_64-pc-linux-gnux32"}; - static const char *const X32LibDirs[] = {"/libx32", "/lib"}; -@@ -2399,7 +2400,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - static const char *const PPC64LETriples[] = { - "powerpc64le-linux-gnu", "powerpc64le-unknown-linux-gnu", - "powerpc64le-none-linux-gnu", "powerpc64le-suse-linux", -- "ppc64le-redhat-linux"}; -+ "ppc64le-redhat-linux", "powerpc64le-conda_cos7-linux-gnu", "powerpc64le-conda-linux-gnu"}; - - static const char *const RISCV32LibDirs[] = {"/lib32", "/lib"}; - static const char *const RISCV32Triples[] = {"riscv32-unknown-linux-gnu", diff --git a/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch b/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch new file mode 100644 index 00000000..f8dc81a6 --- /dev/null +++ b/recipe/patches/0001-Fix-sysroot-detection-for-linux.patch @@ -0,0 +1,48 @@ +From 4d6597584b90d2bc17b440dcdeff29cdc934a6dd Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Mon, 8 Apr 2019 16:32:17 -0500 +Subject: [PATCH 1/7] Fix sysroot detection for linux + +--- + clang/lib/Driver/ToolChains/Linux.cpp | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp +index 1ba222bf83b..ee361924b9e 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -394,18 +394,30 @@ std::string Linux::computeSysRoot() const { + return std::string(); + } + +- if (!GCCInstallation.isValid() || !getTriple().isMIPS()) ++ if (!GCCInstallation.isValid()) ++ return std::string(); ++ ++ // Check for conda layout ++ const StringRef InstallDir = GCCInstallation.getInstallPath(); ++ const StringRef TripleStr = GCCInstallation.getTriple().str(); ++ ++ std::string Path = ++ (InstallDir + "/../../../../" + TripleStr + "/sysroot") ++ .str(); ++ ++ if (getVFS().exists(Path)) ++ return Path; ++ ++ if (!getTriple().isMIPS()) + return std::string(); + + // Standalone MIPS toolchains use different names for sysroot folder + // and put it into different places. Here we try to check some known + // variants. + +- const StringRef InstallDir = GCCInstallation.getInstallPath(); +- const StringRef TripleStr = GCCInstallation.getTriple().str(); + const Multilib &Multilib = GCCInstallation.getMultilib(); + +- std::string Path = ++ Path = + (InstallDir + "/../../../../" + TripleStr + "/libc" + Multilib.osSuffix()) + .str(); + diff --git a/recipe/patches/0002-Fix-sysroot-detection-for-linux.patch b/recipe/patches/0002-Fix-sysroot-detection-for-linux.patch deleted file mode 100644 index 458a232d..00000000 --- a/recipe/patches/0002-Fix-sysroot-detection-for-linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 57d8435de7043719e62d8f67783caa858defaf8f Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 8 Apr 2019 16:32:17 -0500 -Subject: [PATCH 2/8] Fix sysroot detection for linux - ---- - clang/lib/Driver/ToolChains/Linux.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp -index 1ba222bf83b..e45e9d948a5 100644 ---- a/clang/lib/Driver/ToolChains/Linux.cpp -+++ b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -412,6 +412,14 @@ std::string Linux::computeSysRoot() const { - if (getVFS().exists(Path)) - return Path; - -+ Path = -+ (InstallDir + "/../../../../" + TripleStr + "/sysroot") -+ .str(); -+ -+ if (getVFS().exists(Path)) -+ return Path; -+ -+ - Path = (InstallDir + "/../../../../sysroot" + Multilib.osSuffix()).str(); - - if (getVFS().exists(Path)) diff --git a/recipe/patches/0003-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch b/recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch similarity index 73% rename from recipe/patches/0003-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch rename to recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch index 98a3ace9..1d75836d 100644 --- a/recipe/patches/0003-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch +++ b/recipe/patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch @@ -1,33 +1,29 @@ -From 71e378ea8d60be6768548552bb759e167169e132 Mon Sep 17 00:00:00 2001 +From 3d234ba553a1ec9078e107803da4f97b483f8e94 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 25 Aug 2018 09:20:04 -0500 -Subject: [PATCH 3/8] clang: add conda specific env var CONDA_BUILD_SYSROOT +Subject: [PATCH 2/7] clang: add conda specific env var CONDA_BUILD_SYSROOT --- - clang/lib/Driver/Driver.cpp | 9 +++++++-- + clang/lib/Driver/Driver.cpp | 5 +++++ clang/lib/Lex/InitHeaderSearch.cpp | 6 +++++- - 2 files changed, 12 insertions(+), 3 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp -index be8632b0954..04fa0916a7a 100644 +index 488350169ef..168e5977d8f 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp -@@ -1341,8 +1341,13 @@ Compilation *Driver::BuildCompilation(ArrayRef ArgList) { +@@ -1348,6 +1348,11 @@ Compilation *Driver::BuildCompilation(ArrayRef ArgList) { CompilerPath = Split.second; } } -- if (const Arg *A = Args.getLastArg(options::OPT__sysroot_EQ)) -- SysRoot = A->getValue(); + if (std::optional CondaBuildSysrootValue = + llvm::sys::Process::GetEnv("CONDA_BUILD_SYSROOT")) { + SysRoot = *CondaBuildSysrootValue; -+ } else { -+ if (const Arg *A = Args.getLastArg(options::OPT__sysroot_EQ)) -+ SysRoot = A->getValue(); + } ++ // Override CONDA_BUILD_SYSROOT and consume sysroot option + if (const Arg *A = Args.getLastArg(options::OPT__sysroot_EQ)) + SysRoot = A->getValue(); if (const Arg *A = Args.getLastArg(options::OPT__dyld_prefix_EQ)) - DyldPrefix = A->getValue(); - diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp index 41382d7cb3f..3f2fab2b5bb 100644 --- a/clang/lib/Lex/InitHeaderSearch.cpp diff --git a/recipe/patches/0004-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch b/recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch similarity index 94% rename from recipe/patches/0004-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch rename to recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch index b9399dfe..bc776289 100644 --- a/recipe/patches/0004-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch +++ b/recipe/patches/0003-Fix-normalizeProgramName-s-handling-of-dots-outside-.patch @@ -1,7 +1,7 @@ -From 278d19cdfa3bed3d983590b7a58d3bc4ecfe2e0d Mon Sep 17 00:00:00 2001 +From 703241c36d0d97cdbf8caaf9020a1ba68ca7dba8 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 30 Aug 2017 20:01:49 +0100 -Subject: [PATCH 4/8] Fix normalizeProgramName()'s handling of dots outside of +Subject: [PATCH 3/7] Fix normalizeProgramName()'s handling of dots outside of .exe It used to strip everything after the last dot, turning: diff --git a/recipe/patches/0005-Set-VERSION-in-osx-as-well.patch b/recipe/patches/0004-Set-VERSION-in-osx-as-well.patch similarity index 86% rename from recipe/patches/0005-Set-VERSION-in-osx-as-well.patch rename to recipe/patches/0004-Set-VERSION-in-osx-as-well.patch index a768fe36..9b465047 100644 --- a/recipe/patches/0005-Set-VERSION-in-osx-as-well.patch +++ b/recipe/patches/0004-Set-VERSION-in-osx-as-well.patch @@ -1,7 +1,7 @@ -From 24a7281ff97a5b2081a1e336b286acb91c58f900 Mon Sep 17 00:00:00 2001 +From fa5e626e9e956791d467547eddaea6d42f405cde Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 27 Jul 2019 11:55:23 -0500 -Subject: [PATCH 5/8] Set VERSION in osx as well +Subject: [PATCH 4/7] Set VERSION in osx as well --- clang/tools/libclang/CMakeLists.txt | 5 +++++ diff --git a/recipe/patches/0006-Fix-crosscompiling-LLVM-tools.patch b/recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch similarity index 88% rename from recipe/patches/0006-Fix-crosscompiling-LLVM-tools.patch rename to recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch index befd10d7..12d283ae 100644 --- a/recipe/patches/0006-Fix-crosscompiling-LLVM-tools.patch +++ b/recipe/patches/0005-Fix-crosscompiling-LLVM-tools.patch @@ -1,7 +1,7 @@ -From c23ee33d6a264db0f1910ee2f1bd37f725d1cce2 Mon Sep 17 00:00:00 2001 +From b65c6470a8778b0dbc760ed297407d6e8afb4f66 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 11 May 2021 15:08:13 +0200 -Subject: [PATCH 6/8] Fix crosscompiling LLVM tools +Subject: [PATCH 5/7] Fix crosscompiling LLVM tools --- clang/CMakeLists.txt | 10 ++++++++++ diff --git a/recipe/patches/0007-Only-error-on-undefined-TARGET_OS_OSX.patch b/recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch similarity index 76% rename from recipe/patches/0007-Only-error-on-undefined-TARGET_OS_OSX.patch rename to recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch index a013e186..14c4c961 100644 --- a/recipe/patches/0007-Only-error-on-undefined-TARGET_OS_OSX.patch +++ b/recipe/patches/0006-Only-error-on-undefined-TARGET_OS_OSX.patch @@ -1,17 +1,17 @@ -From 43b4ad0dac67198c048c51b0d35661a80fb5b48b Mon Sep 17 00:00:00 2001 +From 90ba141457474dd8034fc405e7c92c85b214b3b1 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 11 May 2021 15:09:51 +0200 -Subject: [PATCH 7/8] Only error on undefined TARGET_OS_OSX +Subject: [PATCH 6/7] Only error on undefined TARGET_OS_OSX --- clang/lib/Driver/ToolChains/Darwin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp -index a73f46bb320..fd8f251edc8 100644 +index 65bd6c6a7eb..3276f9948e8 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp -@@ -1129,7 +1129,7 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple &Triple, +@@ -1136,7 +1136,7 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple &Triple, void DarwinClang::addClangWarningOptions(ArgStringList &CC1Args) const { // Always error about undefined 'TARGET_OS_*' macros. diff --git a/recipe/patches/0008-set-libclang-SOVERSION-unconditionally.patch b/recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch similarity index 93% rename from recipe/patches/0008-set-libclang-SOVERSION-unconditionally.patch rename to recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch index a24e52c7..dfec6384 100644 --- a/recipe/patches/0008-set-libclang-SOVERSION-unconditionally.patch +++ b/recipe/patches/0007-set-libclang-SOVERSION-unconditionally.patch @@ -1,7 +1,7 @@ -From eb4bdaa2aebcbd1ffab433dc0c912d7e563cc18c Mon Sep 17 00:00:00 2001 +From 3477a72499fbb53bf252a489fb70dd56469c1a59 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 14 Apr 2022 11:57:00 +1100 -Subject: [PATCH 8/8] set libclang SOVERSION unconditionally +Subject: [PATCH 7/7] set libclang SOVERSION unconditionally and avoid creating libclang with full version suffix ---