Skip to content

No dependency on ICU for the static build #21

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

Merged
JohanMabille merged 5 commits into from
Jul 29, 2026
Merged

No dependency on ICU for the static build #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
141b915
Removed dependency on ICU in static build
JohanMabille Jul 24, 2026
1201cd4
Triggers CI
JohanMabille Jul 24, 2026
116343c
Update recipe.yaml to modify run_exports
isuruf Jul 27, 2026
9bc492e
Removed non-existence tests since files are installed from dependency
JohanMabille Jul 28, 2026
b23e426
Fixed conflicts
JohanMabille Jul 29, 2026
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
4 changes: 1 addition & 3 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
- quay.io/condaforge/linux-anvil-x86_64:alma10
icu:
- '78'
libpsl:
- '0.22'
target_platform:
- linux-64
zip_keys:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
- quay.io/condaforge/linux-anvil-x86_64:alma10
icu:
- '78'
libpsl:
- '0.22'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
- quay.io/condaforge/linux-anvil-x86_64:alma10
icu:
- '78'
libpsl:
- '0.22'
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ cxx_compiler_version:
- '19'
icu:
- '78'
libpsl:
- '0.22'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ cxx_compiler_version:
- '19'
icu:
- '78'
libpsl:
- '0.22'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@ cxx_compiler:
- vs2022
icu:
- '78'
libpsl:
- '0.22'
target_platform:
- win-64
6 changes: 3 additions & 3 deletions .github/workflows/conda-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
include:
- CONFIG: linux_64_
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -35,7 +35,7 @@ jobs:
runs_on: ['ubuntu-latest']
tools_install_dir: ~/miniforge3
- CONFIG: linux_aarch64_
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand All @@ -47,7 +47,7 @@ jobs:
runs_on: ['ubuntu-latest']
tools_install_dir: ~/miniforge3
- CONFIG: linux_ppc64le_
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
build_workspace_dir: build_artifacts
Expand Down
28 changes: 15 additions & 13 deletions .scripts/build_steps.sh
View file
Open in desktop

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

36 changes: 18 additions & 18 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions .scripts/run_win_build.bat
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop

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

1 change: 1 addition & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ build_platform:
osx_arm64: osx_64
conda_build:
pkg_format: '2'
conda_build_tool: rattler-build
conda_forge_output_validation: true
github:
branch_name: main
Expand Down
8 changes: 7 additions & 1 deletion recipe/bld.bat → recipe/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ set "PKG_CONFIG_PATH=%LIBRARY_LIB%\pkgconfig;%LIBRARY_PREFIX%\share\pkgconfig"
:: get mixed path (forward slash) form of prefix so host prefix replacement works
set "LIBRARY_PREFIX_M=%LIBRARY_PREFIX:\=/%"

%BUILD_PREFIX%\Scripts\meson.exe setup builddir --wrap-mode=nofallback --buildtype=release --prefix=%LIBRARY_PREFIX_M% --backend=ninja -Druntime=libicu -Dbuiltin=true --default-library=both
set "MESON_ARGS=--wrap-mode=nofallback --buildtype=release --prefix=%LIBRARY_PREFIX_M% --backend=ninja -Dbuiltin=true"

if "%PKG_NAME%"=="libpsl-static" (
%BUILD_PREFIX%\Scripts\meson.exe setup builddir %MESON_ARGS% -Druntime=no --default-library=static
) else (
%BUILD_PREFIX%\Scripts\meson.exe setup builddir %MESON_ARGS% -Druntime=libicu --default-library=shared
)
if errorlevel 1 exit 1

ninja -v -C builddir -j %CPU_COUNT%
Expand Down
20 changes: 15 additions & 5 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,20 @@ if [[ "$target_platform" == "osx-arm64" && "$CONDA_BUILD_CROSS_COMPILATION" == "
unset _CONDA_PYTHON_SYSCONFIGDATA_NAME
fi

meson setup builddir \
${MESON_ARGS} \
--default-library=both\
-Druntime=libicu \
-Dbuiltin=true

if [[ $PKG_NAME == "libpsl" ]]; then
meson setup builddir \
${MESON_ARGS} \
--default-library=shared \
-Druntime=libicu \
-Dbuiltin=true
else
meson setup builddir \
${MESON_ARGS} \
--default-library=static \
-Druntime=no \
-Dbuiltin=true
fi

ninja -v -C builddir -j ${CPU_COUNT}
ninja -C builddir install -j ${CPU_COUNT}
81 changes: 0 additions & 81 deletions recipe/meta.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading