conda-forge · github-actions · Aug 21, 2024 · Aug 9, 2024 · Aug 10, 2024 · Aug 21, 2024
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:

@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:

@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libclang_soversion:

@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '16'
+- '17'
 libclang_soversion:
 - '13'
 libxml2:

@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '16'
+- '17'
 libclang_soversion:
 - '13'
 libxml2:

@@ -1,4 +1,4 @@
-{% set version = "19.1.0.rc2" %}
+{% set version = "19.1.0.rc3" %}
 {% set major_version = version.split(".")[0] %}
 {% set build_number = 0 %}
 
@@ -25,7 +25,7 @@ package:
 
 source:
   - url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz
-    sha256: 5332e77a658136c778fc32ec2a3687de4d63e0ff48010be205c4e7af6e76f1f1
+    sha256: 57f926edf60a92947fa9b8b0adfdf3c6f2182a4ecf1c929176218eef619d7411
     patches:
       - patches/0001-Find-conda-gcc-installation.patch
       - patches/0002-Fix-sysroot-detection-for-linux.patch
@@ -373,11 +373,6 @@ outputs:
       run:
         - {{ pin_compatible("libcxx", max_pin=None) }}                        # [osx]
         - {{ pin_subpackage("libclang-cpp" ~ minor_aware_ext, exact=True) }}  # [unix]
-      run_constrained:
-        - clangdev {{ version }}
-        - clangxx {{ version }}
-        - clang-tools {{ version }}
-        - llvm-tools {{ version }}
     test:
       commands:
         # presence of versioned libraries
@@ -416,6 +411,10 @@ outputs:
         - zlib     # [unix]
         - zstd     # [unix]
     requirements:
+      # for run-exports
+      build:                        # [win]
+        - {{ stdlib('c') }}         # [win]
+        - {{ compiler('cxx') }}     # [win]
       host:
         - {{ pin_subpackage("clang-" ~ major_version, exact=True) }}
         # Use the same requirements as the top-level requirements
@@ -455,6 +454,10 @@ outputs:
         - zlib     # [unix]
         - zstd     # [unix]
     requirements:
+      # for run-exports
+      build:                        # [win]
+        - {{ stdlib('c') }}         # [win]
+        - {{ compiler('cxx') }}     # [win]
       host:
         - {{ pin_subpackage("clang", exact=True) }}
         # Use the same requirements as the top-level requirements

@@ -1,27 +1,26 @@
-From 72e69beb2480fac383d4742b67ed9e0e38e534b8 Mon Sep 17 00:00:00 2001
+From ac174def7b2254037fe259bfebb73ec61e853bbc Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 8 Apr 2019 16:20:03 -0500
 Subject: [PATCH 1/9] Find conda gcc installation
 
 ---
- clang/lib/Driver/ToolChains/Gnu.cpp | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ clang/lib/Driver/ToolChains/Gnu.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 52c2ee90b1b2..0e5304fbbd1a 100644
+index 543f3965dfd4..855326529b0f 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2463,7 +2463,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
-   // lists should shrink over time. Please don't add more elements to *Triples.
+@@ -2464,7 +2464,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
    static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
    static const char *const AArch64Triples[] = {
--      "aarch64-none-linux-gnu", "aarch64-redhat-linux", "aarch64-suse-linux"};
-+      "aarch64-none-linux-gnu", "aarch64-redhat-linux", "aarch64-suse-linux",
-+      "aarch64-conda_cos7-linux-gnu", "aarch64-conda-linux-gnu"};
+       "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"};
 
-@@ -2491,7 +2492,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2492,7 +2492,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
        "x86_64-pc-linux-gnu",    "x86_64-redhat-linux6E",
        "x86_64-redhat-linux",    "x86_64-suse-linux",
        "x86_64-manbo-linux-gnu", "x86_64-slackware-linux",
@@ -31,7 +30,7 @@ index 52c2ee90b1b2..0e5304fbbd1a 100644
    static const char *const X32Triples[] = {"x86_64-linux-gnux32",
                                             "x86_64-pc-linux-gnux32"};
    static const char *const X32LibDirs[] = {"/libx32", "/lib"};
-@@ -2554,7 +2556,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2555,7 +2556,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
    static const char *const PPC64LELibDirs[] = {"/lib64", "/lib"};
    static const char *const PPC64LETriples[] = {
        "powerpc64le-unknown-linux-gnu", "powerpc64le-none-linux-gnu",

@@ -1,4 +1,4 @@
-From 1aa761a522dd021145ac09fbe961bd076f45e5e1 Mon Sep 17 00:00:00 2001
+From 302101043ac3076117bab45be0477bba1cf06e7f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 8 Apr 2019 16:32:17 -0500
 Subject: [PATCH 2/9] Fix sysroot detection for linux

@@ -1,4 +1,4 @@
-From 32299d5c11a37cf93f6750723f15e45b7df90378 Mon Sep 17 00:00:00 2001
+From f957da489fc5d49f04051430965496d4708cf9f4 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 25 Aug 2018 09:20:04 -0500
 Subject: [PATCH 3/9] clang: add conda specific env var CONDA_BUILD_SYSROOT
@@ -31,7 +31,7 @@ index 8e44d5afa40e..9c66a52a9887 100644
      SysRoot = A->getValue();
    if (const Arg *A = Args.getLastArg(options::OPT__dyld_prefix_EQ))
 diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
-index c6f9d7beffb1..ec3b6033313b 100644
+index 17d57b2f7eed..99747a4fb1aa 100644
 --- a/clang/lib/Driver/ToolChains/Darwin.cpp
 +++ b/clang/lib/Driver/ToolChains/Darwin.cpp
 @@ -29,6 +29,18 @@

@@ -1,4 +1,4 @@
-From bff434c927f712269cd0d112fccbae839a6a536e Mon Sep 17 00:00:00 2001
+From a7097ec7f616126b8869ce68375efd3d75493b78 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 30 Aug 2017 20:01:49 +0100
 Subject: [PATCH 4/9] Fix normalizeProgramName()'s handling of dots outside of

@@ -1,4 +1,4 @@
-From a72f1382b51402d088067ca95886a234f9c3c221 Mon Sep 17 00:00:00 2001
+From ee481bf265df400cf4c4a359f8933ada8570fef5 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 27 Jul 2019 11:55:23 -0500
 Subject: [PATCH 5/9] Set VERSION in osx as well

@@ -1,4 +1,4 @@
-From b055a6df3e9569bc527ac9aa3c7a667c5451db0a Mon Sep 17 00:00:00 2001
+From 3a74c0d2d47d58f826326e348b3a95337bbb5082 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Tue, 11 May 2021 15:08:13 +0200
 Subject: [PATCH 6/9] Fix crosscompiling LLVM tools

@@ -1,4 +1,4 @@
-From 6a7ca15c5e2761f5818f8f0b1312ad49f1392fe2 Mon Sep 17 00:00:00 2001
+From bbf7c64e11c653288b89e6fd3189dbbed500d61a Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Thu, 14 Apr 2022 11:57:00 +1100
 Subject: [PATCH 7/9] set libclang SOVERSION unconditionally

@@ -1,4 +1,4 @@
-From 2067b5e6fd462b1418a22a5aa50fd3460b74fe3e Mon Sep 17 00:00:00 2001
+From 3af43c5dc397e53972911521072086c9f5ad7b11 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Thu, 28 Dec 2023 19:32:19 +0530
 Subject: [PATCH 8/9] Make PIE default on macOS too.
@@ -9,10 +9,10 @@ This is the default for Linux from LLVM-15
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
-index ec3b6033313b..5a03f24664a5 100644
+index 99747a4fb1aa..e3b969d814a0 100644
 --- a/clang/lib/Driver/ToolChains/Darwin.cpp
 +++ b/clang/lib/Driver/ToolChains/Darwin.cpp
-@@ -3263,7 +3263,7 @@ bool Darwin::SupportsEmbeddedBitcode() const {
+@@ -3286,7 +3286,7 @@ bool Darwin::SupportsEmbeddedBitcode() const {
 
  bool MachO::isPICDefault() const { return true; }
 

@@ -1,4 +1,4 @@
-From 4fa189cdd7a083061adb5484c1097a71d7262299 Mon Sep 17 00:00:00 2001
+From cb03470268c8ee2dca26a46a381cf27f1664f719 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 11 Mar 2024 14:03:12 -0500
 Subject: [PATCH 9/9] Find ROCm device library in conda layout