From 74204e6b81777c3ccf7f43ecac6ad8046ca7a59f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 26 Aug 2024 22:58:20 +1100 Subject: [PATCH 1/2] bootstrap libcxx-devel as a wrapper around libcxx --- recipe/meta.yaml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b727d2b4..9f4dc609 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ source: - patches/0004-Work-around-stray-nostdlib-flags-causing-errors-with.patch build: - number: 5 + number: 6 skip: true # [win] skip: true # [ppc64le or aarch64] @@ -50,13 +50,14 @@ outputs: run_exports: # [hardening == "debug"] # packages built with hardened lib must not be installable without extra label - libcxx =*=debug* # [hardening == "debug"] - files: - - include/c++ # [unix] - - lib/libc++.a # [unix] - - lib/libc++experimental.* # [unix] - - Library/include/c++ # [win] - - Library/lib/c++*.lib # [win] - - Library/lib/libc++*.lib # [win] + # temporarily still in libcxx, until we update compiler stack w.r.t. libcxx-devel + # files: + # - include/c++ # [unix] + # - lib/libc++.a # [unix] + # - lib/libc++experimental.* # [unix] + # - Library/include/c++ # [win] + # - Library/lib/c++*.lib # [win] + # - Library/lib/libc++*.lib # [win] requirements: host: - {{ pin_subpackage("libcxx", exact=True) }} @@ -131,6 +132,13 @@ outputs: - lib/libc++.dylib # [osx] - lib/libc++.*.dylib # [osx] - Library/bin/c++*.dll # [win] + # temporarily still in libcxx, until we update compiler stack w.r.t. libcxx-devel + - include/c++ # [unix] + - lib/libc++.a # [unix] + - lib/libc++experimental.* # [unix] + - Library/include/c++ # [win] + - Library/lib/c++*.lib # [win] + - Library/lib/libc++*.lib # [win] requirements: build: - {{ stdlib('c') }} @@ -148,9 +156,9 @@ outputs: - test -f $PREFIX/lib/libc++.so # [linux] - test -f $PREFIX/lib/libc++.dylib # [osx] # absence of static libs & headers - - test ! -f $PREFIX/lib/libc++.a # [unix] - - test ! -f $PREFIX/lib/libc++experimental.a # [unix] - - test ! -d $PREFIX/include/c++ # [unix] + # - test ! -f $PREFIX/lib/libc++.a # [unix] + # - test ! -f $PREFIX/lib/libc++experimental.a # [unix] + # - test ! -d $PREFIX/include/c++ # [unix] - name: libcxxabi build: From c74add018a8b06fee5e1d3378767f1146af0c827 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 26 Aug 2024 22:59:31 +1100 Subject: [PATCH 2/2] Revert "disable libcxx-testing dowstreams to bootstrap" This reverts commit 1d69bdc6144e32bd067e245d685be7f91155d765. --- recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f4dc609..7a9de5eb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -103,8 +103,6 @@ outputs: downstreams: # [osx] - python-symengine # [osx] - openturns # [osx] - # disabled until libcxx-testing depends on `libcxx-devel` - {% if False %} # test current libcxx against old clang builds; # version correspondence is 0.{{ CLANG_MAJOR }} # these tests are unusual in that they use -Wl,-rpath, but not -L. @@ -112,7 +110,6 @@ outputs: - libcxx-testing 0.17 # [osx] - libcxx-testing 0.16 # [osx] - libcxx-testing 0.15 # [osx] - {% endif %} {% endif %} - name: libcxx