Skip to content

Commit 6ecb710

Browse files
committed
Bring in ncurses on linux-64 for libtinfow issue (fixes emews/EMEWS_Issues#61)
1 parent 57aa759 commit 6ecb710

File tree

5 files changed

+27
-19
lines changed

5 files changed

+27
-19
lines changed

dev/conda/conda-build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ log "PKG_NAME: $PKG_NAME"
121121

122122
# Default dependencies:
123123
export USE_ANT=1
124-
export USE_GCC=1
125124
export USE_CLANG=0
125+
export USE_GCC=1
126+
export USE_NCURSES=0
126127
export USE_TK=0
127128
export USE_ZLIB=0
128129
export USE_ZSH=1
@@ -136,6 +137,7 @@ source $DEV_CONDA/$CONDA_PLATFORM/deps.sh
136137
# Provide a default value for ease of debugging:
137138
export GITHUB_ACTIONS=${GITHUB_ACTIONS:-false}
138139

140+
# Export a DATE for provenance in m4-filtered files:
139141
export DATE=${(%)DATE_FMT_S}
140142
# Report with relative directories:
141143
log "writing ${PWD#${SWIFT_T_TOP}/}/meta.yaml"
@@ -186,6 +188,7 @@ export PYTHONWARNINGS="ignore::UserWarning"
186188
conda build purge-all
187189

188190
log "conda build: $BUILD_ARGS ..."
191+
189192
# Build the package!
190193
conda build $BUILD_ARGS
191194
)

dev/conda/conda-install.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ print "using conda: " $( which conda )
9494
# The version may be omitted if we are flexible.
9595
USE_ANT=1
9696
USE_GCC=1
97+
USE_NCURSES=0
9798
USE_ZSH=1
9899
SPEC_CLANG=""
99100
SPEC_MPICH="mpich"
@@ -109,9 +110,10 @@ fi
109110

110111
# Build dependency list:
111112
LIST=()
112-
if (( USE_ANT )) LIST+=ant
113-
if (( USE_GCC )) LIST+=gcc
114-
if (( USE_ZSH )) LIST+=zsh
113+
if (( USE_ANT )) LIST+=ant
114+
if (( USE_GCC )) LIST+=gcc
115+
if (( USE_NCURSES )) LIST+=ncurses
116+
if (( USE_ZSH )) LIST+=zsh
115117
LIST+=(
116118
autoconf
117119
$SPEC_CLANG
@@ -124,9 +126,6 @@ LIST+=(
124126
$SPEC_TK
125127
)
126128

127-
# # # Needed for _strstr issue:
128-
# if [[ $CONDA_PLATFORM == "osx-arm64" ]] LIST+=( "clang$PIN_CLANG" )
129-
130129
# Needed for libstdc++ GLIBCXX version issue on GCE Jenkins:
131130
if [[ ${JENKINS_HOME:-} != "" ]] LIST+=( "gcc=14" )
132131

dev/conda/linux-64/deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
# linux-64 DEPS SH
33

4+
export USE_NCURSES=1
45
# For some reason zlib is not found on linux-64, Python 3.8
56
# as of 2024-12-11:
67
# Needed for all linux-64 as of 2024-12-17
7-
# if [[ $PYTHON_VERSION == 3.8* ]]
88
export USE_ZLIB=1

dev/conda/meta-template.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,24 @@ requirements:
3939
- openjdk>=17 # Security issue in Java < 11.72.19
4040
- m4_getenv(SPEC_MPICH)
4141
- swig
42-
m4_ifelse(m4_getenv(USE_ANT), `1',m4_include(pkgs-ant.yaml))m4_dnl
43-
m4_ifelse(m4_getenv(USE_CLANG),`1',m4_include(pkgs-clang.yaml))m4_dnl
44-
m4_ifelse(m4_getenv(USE_GCC), `1',m4_include(pkgs-gcc.yaml))m4_dnl
45-
m4_ifelse(m4_getenv(USE_TK), `1',m4_include(pkgs-tk.yaml))m4_dnl
46-
m4_ifelse(m4_getenv(USE_ZSH), `1',m4_include(pkgs-zsh.yaml))m4_dnl
47-
m4_ifelse(m4_getenv(ENABLE_R), `1',m4_include(pkgs-R.yaml))m4_dnl
42+
m4_ifelse(m4_getenv(USE_ANT), `1', m4_include(pkgs-ant.yaml))m4_dnl
43+
m4_ifelse(m4_getenv(USE_CLANG), `1', m4_include(pkgs-clang.yaml))m4_dnl
44+
m4_ifelse(m4_getenv(USE_GCC), `1', m4_include(pkgs-gcc.yaml))m4_dnl
45+
m4_ifelse(m4_getenv(USE_NCURSES), `1', m4_include(pkgs-ncurses.yaml))m4_dnl
46+
m4_ifelse(m4_getenv(USE_TK), `1', m4_include(pkgs-tk.yaml))m4_dnl
47+
m4_ifelse(m4_getenv(USE_ZSH), `1', m4_include(pkgs-zsh.yaml))m4_dnl
48+
m4_ifelse(m4_getenv(ENABLE_R), `1', m4_include(pkgs-R.yaml))m4_dnl
4849
run:
4950
- python m4_getenv(PYTHON_SERIES)
5051
- openjdk>=17
5152
- m4_getenv(SPEC_MPICH)
5253
- swig
53-
m4_ifelse(m4_getenv(USE_CLANG),`1',m4_include(pkgs-clang.yaml))m4_dnl
54-
m4_ifelse(m4_getenv(USE_GCC), `1',m4_include(pkgs-gcc.yaml))m4_dnl
55-
m4_ifelse(m4_getenv(USE_TK), `1',m4_include(pkgs-tk.yaml))m4_dnl
56-
m4_ifelse(m4_getenv(USE_ZSH), `1',m4_include(pkgs-zsh.yaml))m4_dnl
57-
m4_ifelse(m4_getenv(ENABLE_R), `1',m4_include(pkgs-R.yaml))m4_dnl
54+
m4_ifelse(m4_getenv(USE_CLANG), `1', m4_include(pkgs-clang.yaml))m4_dnl
55+
m4_ifelse(m4_getenv(USE_GCC), `1', m4_include(pkgs-gcc.yaml))m4_dnl
56+
m4_ifelse(m4_getenv(USE_NCURSES), `1', m4_include(pkgs-ncurses.yaml))m4_dnl
57+
m4_ifelse(m4_getenv(USE_TK), `1', m4_include(pkgs-tk.yaml))m4_dnl
58+
m4_ifelse(m4_getenv(USE_ZSH), `1', m4_include(pkgs-zsh.yaml))m4_dnl
59+
m4_ifelse(m4_getenv(ENABLE_R), `1', m4_include(pkgs-R.yaml))m4_dnl
5860

5961
test:
6062
commands:

dev/conda/pkgs-ncurses.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# pkgs-ncurses.yaml: START
2+
# Extra packages for ncurses
3+
- ncurses
4+
# pkgs-ncurses.yaml: STOP

0 commit comments

Comments
 (0)