Skip to content

Commit f0d9be9

Browse files
authored
Merge pull request #714 from h-vetinari/cdts
[main] switch away from cdts
2 parents ac41d0c + abad24a commit f0d9be9

5 files changed

Lines changed: 12 additions & 9 deletions

File tree

.scripts/build_steps.sh

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_win_build.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-locally.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/meta.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
55
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
66
{% set ver3nd = ''.join(version.split('.')[0:3]) %}
7-
{% set build_number = 0 %}
7+
{% set build_number = 1 %}
88

99
# this makes the linter happy
1010
{% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -91,6 +91,8 @@ outputs:
9191
ignore_run_exports_from: # [unix]
9292
# C++ only installed so CXX is defined for distutils/sysconfig.
9393
- {{ compiler('cxx') }} # [unix]
94+
# this is just to get the headers needed for tk.h, but is unused
95+
- xorg-libx11
9496
# Disabled until verified to work correctly
9597
detect_binary_files_with_prefix: true
9698
# detect_binary_files_with_prefix: False
@@ -135,8 +137,6 @@ outputs:
135137
- {{ compiler('c') }}
136138
- {{ stdlib('c') }}
137139
- {{ compiler('cxx') }}
138-
- {{ cdt('xorg-x11-proto-devel') }} # [linux]
139-
- {{ cdt('libx11-devel') }} # [linux]
140140
- make # [not win]
141141
- libtool # [unix]
142142
- pkg-config # [not win]
@@ -168,6 +168,8 @@ outputs:
168168
- openssl
169169
- readline # [not win]
170170
- tk
171+
# this is just to get the headers needed for tk.h, but is unused
172+
- xorg-libx11
171173
- ncurses # [unix]
172174
- libffi
173175
- ld_impl_{{ target_platform }} >=2.36.1 # [linux]

recipe/yum_requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#tk_needs_libx11_but_avoids_a_runtime_requirement_of_libx11_to_reduce_the_dependencies_of_python
12
libX11
3+
#libxcb_is_a_dependency_of_libx11_but_deps_are_wrong_on_our_cdt
24
libxcb
35
libxau

0 commit comments

Comments
 (0)