Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split off headers into libcxx-devel #190

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Split off headers into libcxx-devel #190

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14864e8
Revert "bootstrap libcxx-devel as a wrapper around libcxx"
h-vetinari Aug 29, 2024
92e7009
move static libs to `libcxx` output, necessary for cross-compilation
h-vetinari Aug 29, 2024
b74a66e
Update meta.yaml
isuruf Aug 29, 2024
b600eef
remove dependence on clangdev on linux
h-vetinari Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ source:
- patches/0004-Work-around-stray-nostdlib-flags-causing-errors-with.patch

build:
number: 6
number: 7
skip: true # [win]
skip: true # [ppc64le or aarch64]

Expand All @@ -39,7 +39,7 @@ requirements:
- {{ stdlib('c') }}
- python >3 # [not osx]
host:
- clangdev {{ version }} # [not osx]
# - clangdev {{ version }} # [not osx]
- llvmdev {{ version }} # [not osx]

outputs:
Expand All @@ -50,19 +50,14 @@ outputs:
run_exports: # [hardening == "debug"]
# packages built with hardened lib must not be installable without extra label
- libcxx =*=debug* # [hardening == "debug"]
# 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]
files:
- include/c++ # [unix]
- Library/include/c++ # [win]
requirements:
host:
- {{ pin_subpackage("libcxx", exact=True) }}
run:
- {{ pin_subpackage("libcxx", exact=True) }}
- {{ pin_subpackage("libcxx", max_pin=None) }}
Comment on lines -65 to +60
Copy link
Member Author

@h-vetinari h-vetinari Aug 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I think I get now how this solves conda-forge/clangdev-feedstock#310.

If we're using the libcxx-devel 16.x headers to compile something, while having libcxx 20 in the environment, that does run the risk of running into minor ABI differences (and potentially missing symbols, if some got removed in later libcxx), but that's still essentially the same standpoint as we have already, i.e. "libcxx is essentially ABI-stable (and the enormous effort to properly handle any differences isn't worth it, given the relative rarity of breaks)"

run_constrained:
- __osx <12 # [osx and (sys_abi == "pre-12")]

Expand Down Expand Up @@ -129,11 +124,8 @@ 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:
Expand All @@ -149,13 +141,13 @@ outputs:
- sysroot_{{ target_platform }} >={{ c_stdlib_version }} # [linux]
test:
commands:
# presence of shared libraries
# presence of shared & static libraries
- 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]
# absence of headers
- test ! -d $PREFIX/include/c++ # [unix]

- name: libcxxabi
build:
Expand Down