Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ jobs:
matrix:
include:
- CONFIG: linux_64_
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['ubuntu-latest']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_aarch64_
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['ubuntu-24.04-arm']
Expand Down Expand Up @@ -104,7 +106,7 @@ jobs:
env:
# default value; make it explicit, as it needs to match with artefact
# generation below. Not configurable for now, can be revisited later
CONDA_BLD_DIR: C:\bld
CONDA_BLD_PATH: C:\bld
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
Expand Down
2 changes: 1 addition & 1 deletion pixi.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -o xtrace -o nounset -o pipefail -o errexit

if [[ ${CONDA_BUILD_CROSS_COMPILATION:-0} == 1 ]]; then
if [[ "${build_platform}" != "${target_platform}" ]]; then
BOOTSTRAP_CMAKE_ARGS=${CMAKE_ARGS//${PREFIX}/${BUILD_PREFIX}}
BOOTSTRAP_CMAKE_ARGS=${BOOTSTRAP_CMAKE_ARGS//${CONDA_TOOLCHAIN_HOST}/${CONDA_TOOLCHAIN_BUILD}}
# libintl is only used on macOS
if [[ ${target_platform} =~ .*osx.* ]]; then
if [[ "${target_platform}" == osx-* ]]; then
BOOTSTRAP_CMAKE_ARGS="${BOOTSTRAP_CMAKE_ARGS} -DLIBINTL_LIBRARY=${BUILD_PREFIX}/lib/libintl${SHLIB_EXT}"
fi

Expand Down Expand Up @@ -52,11 +52,17 @@ cmake -S cmake.deps -B .deps \

cmake --build .deps

extra_args=()
if [[ "${target_platform}" == osx-* ]]; then
extra_args+=(-DLIBINTL_LIBRARY="${PREFIX}/lib/libintl${SHLIB_EXT}")
fi

cmake -S . -B build \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_TRANSLATIONS=ON \
-DLIBUV_LIBRARY="${PREFIX}/lib/libuv${SHLIB_EXT}" \
-DLPEG_LIBRARY="${PREFIX}/lib/liblpeg${SHLIB_EXT}" \
"${extra_args[@]}" \
${CMAKE_ARGS}
cmake --build build --parallel "${CPU_COUNT}"
cmake --install build --parallel "${CPU_COUNT}"
Expand Down
4 changes: 1 addition & 3 deletions recipe/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source:
sha256: 41898a5073631bc8fd9ac43476b811c05fb3b88ffb043d4fbb9e75e478457336

build:
number: 1
number: 2

requirements:
build:
Expand Down Expand Up @@ -44,8 +44,6 @@ requirements:
then: libiconv
- if: osx or win
then: libintl-devel
- if: osx
then: gettext
run:
- luajit-openresty

Expand Down