From 141b91585f3084ca8b7468b6ccdea6d004ab9bf4 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 24 Jul 2026 12:05:45 +0200 Subject: [PATCH 1/5] Removed dependency on ICU in static build --- .ci_support/linux_64_.yaml | 4 +- .ci_support/linux_aarch64_.yaml | 4 +- .ci_support/linux_ppc64le_.yaml | 4 +- .ci_support/osx_64_.yaml | 2 - .ci_support/osx_arm64_.yaml | 2 - .ci_support/win_64_.yaml | 2 - .github/workflows/conda-build.yml | 6 +- .scripts/build_steps.sh | 28 ++++---- .scripts/run_osx_build.sh | 36 +++++----- .scripts/run_win_build.bat | 8 +-- README.md | 2 + conda-forge.yml | 1 + recipe/{bld.bat => build.bat} | 8 ++- recipe/build.sh | 20 ++++-- recipe/meta.yaml | 81 ----------------------- recipe/recipe.yaml | 105 ++++++++++++++++++++++++++++++ 16 files changed, 173 insertions(+), 140 deletions(-) rename recipe/{bld.bat => build.bat} (58%) delete mode 100644 recipe/meta.yaml create mode 100644 recipe/recipe.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6d0f189..044fadb 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -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: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index ceb4f7f..56dff3e 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -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: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 36456d1..909275d 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -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: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 236c5bf..935d045 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -20,8 +20,6 @@ cxx_compiler_version: - '19' icu: - '78' -libpsl: -- '0.22' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d09d970..7a39aa4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -20,8 +20,6 @@ cxx_compiler_version: - '19' icu: - '78' -libpsl: -- '0.22' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 61e1a37..c14300b 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -10,7 +10,5 @@ cxx_compiler: - vs2022 icu: - '78' -libpsl: -- '0.22' target_platform: - win-64 diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 20b3107..ba6fe64 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -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 @@ -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 @@ -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 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5c97f74..a5a9998 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -36,7 +36,7 @@ mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d- echo > /opt/conda/conda-meta/history micromamba install --root-prefix ~/.conda --prefix /opt/conda \ --yes --override-channels --channel conda-forge --strict-channel-priority \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" + pip rattler-build conda-forge-ci-setup=4 "conda-build>=26.3" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 # set up the condarc @@ -50,7 +50,7 @@ source run_conda_forge_build_setup make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --test skip" fi @@ -67,15 +67,15 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # - --output-id vs. --output-name # - --clobber-file vs. none # - none vs. --target-platform - conda debug \ - "${RECIPE_ROOT}" \ + export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${FEEDSTOCK_ROOT}/build_artifacts}" + rattler-build debug setup \ + --recipe "${RECIPE_ROOT}" \ -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ - ${BUILD_OUTPUT_ID:+--output-id "${BUILD_OUTPUT_ID}"} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + ${BUILD_OUTPUT_ID:+--output-name "${BUILD_OUTPUT_ID}"} \ + --target-platform "${HOST_PLATFORM}" - # Drop into an interactive shell - /bin/bash + rattler-build debug shell else # differences between conda-build vs. rattler-build # - recipe is positional vs. --recipe "${RECIPE_ROOT}" @@ -83,13 +83,15 @@ else # - --clobber-file vs. none # - none vs. --target-platform # - --extra-meta a=b c=d vs. --extra-meta a=b --extra-meta c=d - conda-build \ - "${RECIPE_ROOT}" \ + + rattler-build build \ + --recipe "${RECIPE_ROOT}" \ -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ - --suppress-variables \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ - --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + --target-platform "${HOST_PLATFORM}" \ + --extra-meta flow_run_id="${flow_run_id:-}" \ + --extra-meta remote_url="${remote_url:-}" \ + --extra-meta sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b0eda55..18a7c7f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ chmod +x "${micromamba_exe}" echo "Creating environment" "${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ --channel conda-forge \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" + pip rattler-build conda-forge-ci-setup=4 "conda-build>=26.3" echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" echo "Cleaning up micromamba" @@ -89,33 +89,33 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null -echo -e "\n\nMaking the build clobber file" -make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" - fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - # Drop into an interactive shell - /bin/bash + export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${FEEDSTOCK_ROOT:-$PWD}/build_artifacts}" + rattler-build debug setup \ + --recipe ./recipe \ + -m ./.ci_support/${CONFIG}.yaml \ + --target-platform "${HOST_PLATFORM}" \ + ${BUILD_OUTPUT_ID:+--output-name "${BUILD_OUTPUT_ID}"} \ + ${EXTRA_CB_OPTIONS:-} + + rattler-build debug shell else if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --test skip" fi - conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ - --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + rattler-build build --recipe ./recipe \ + -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --target-platform "${HOST_PLATFORM}" \ + --extra-meta flow_run_id="$flow_run_id" \ + --extra-meta remote_url="$remote_url" \ + --extra-meta sha="$sha" ( startgroup "Inspecting artifacts" ) 2> /dev/null diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index c07d98e..8d64121 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -31,7 +31,7 @@ if !errorlevel! neq 0 exit /b !errorlevel! echo Creating environment call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ --channel conda-forge ^ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=26.3" + pip rattler-build conda-forge-ci-setup=4 "conda-build>=26.3" if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% del /S /Q "%MAMBA_ROOT_PREFIX%" >nul @@ -64,19 +64,19 @@ if EXIST LICENSE.txt ( ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( if [%CROSSCOMPILING_EMULATOR%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --test skip" ) ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% --extra-meta remote_url=%remote_url% --extra-meta sha=%sha%" ) call :end_group :: Build the recipe echo Building recipe -conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +rattler-build.exe build --recipe "recipe" -m .ci_support\%CONFIG%.yaml %EXTRA_CB_OPTIONS% --target-platform %HOST_PLATFORM% if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" diff --git a/README.md b/README.md index eced363..58bc8cf 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Package license: MIT Summary: A C library to handle the Public Suffix List +Development: https://github.com/rockdaboot/libpsl + Current build status ==================== diff --git a/conda-forge.yml b/conda-forge.yml index 2c603b9..bde99a9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -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 diff --git a/recipe/bld.bat b/recipe/build.bat similarity index 58% rename from recipe/bld.bat rename to recipe/build.bat index a3218f8..fe9d305 100644 --- a/recipe/bld.bat +++ b/recipe/build.bat @@ -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% diff --git a/recipe/build.sh b/recipe/build.sh index 9f354c2..2ab2680 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -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} diff --git a/recipe/meta.yaml b/recipe/meta.yaml deleted file mode 100644 index 2ba77b9..0000000 --- a/recipe/meta.yaml +++ /dev/null @@ -1,81 +0,0 @@ -{% set name = "libpsl" %} -{% set version = "0.22.0" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: https://github.com/rockdaboot/{{ name }}/releases/download/{{ version }}/{{ name }}-{{ version }}.tar.gz - sha256: c45c3aa17576b99873e05a9b09a44041b065bbfa390e6d474d06fbfaeb9c7722 - -build: - number: 1 - run_exports: - # Just a guess - - {{ pin_subpackage('libpsl', max_pin='x.x') }} - -requirements: - build: - - {{ compiler('c') }} - - {{ stdlib("c") }} - - {{ compiler('cxx') }} - - ninja - - pkg-config - - meson - host: - - icu -outputs: - - name: libpsl - files: - - include/libpsl.h # [unix] - - lib/pkgconfig/libpsl.pc # [unix] - - lib/libpsl.so* # [linux] - - lib/libpsl*.dylib # [osx] - - Library/include/libpsl.h # [win] - - Library/lib/pkgconfig/libpsl.pc # [win] - - Library/bin/psl-*.dll # [win] - - Library/lib/psl.lib # [win] - test: - commands: - - test -f ${PREFIX}/include/libpsl.h # [unix] - - test -f ${PREFIX}/lib/pkgconfig/libpsl.pc # [unix] - - test -f ${PREFIX}/lib/libpsl.so # [linux] - - test -f ${PREFIX}/lib/libpsl.dylib # [osx] - - test ! -f ${PREFIX}/lib/libpsl.a # [unix] - - if not exist %LIBRARY_INC%\\libpsl.h exit 1 # [win] - - if not exist %LIBRARY_LIB%\\pkgconfig\\libpsl.pc exit 1 # [win] - - if not exist %LIBRARY_LIB%\\psl.lib exit 1 # [win] - - if not exist %LIBRARY_BIN%\\psl-*.dll exit 1 # [win] - - - name: libpsl-static - requirements: - host: - - {{ pin_subpackage('libpsl', exact=True) }} - run: - - {{ pin_subpackage('libpsl', exact=True) }} - - files: - - lib/libpsl.a # [unix] - - Library/lib/libpsl.a # [win] - test: - commands: - - test -f ${PREFIX}/include/libpsl.h # [unix] - - test -f ${PREFIX}/lib/pkgconfig/libpsl.pc # [unix] - - test -f $PREFIX/lib/libpsl.a # [unix] - - test -f ${PREFIX}/lib/libpsl.so # [linux] - - if not exist %LIBRARY_INC%\\libpsl.h exit 1 # [win] - - if not exist %LIBRARY_LIB%\\pkgconfig\\libpsl.pc exit 1 # [win] - - if not exist %LIBRARY_LIB%\libpsl.a exit 1 # [win] - -about: - home: https://github.com/rockdaboot/libpsl - license: MIT - license_family: MIT - license_file: LICENSE - summary: A C library to handle the Public Suffix List - -extra: - recipe-maintainers: - - JohanMabille - - tschoonj diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml new file mode 100644 index 0000000..492340f --- /dev/null +++ b/recipe/recipe.yaml @@ -0,0 +1,105 @@ +context: + version: "0.22.0" + build_number: 2 + +recipe: + name: libpsl-packages + version: ${{ version }} + +source: + url: https://github.com/rockdaboot/libpsl/releases/download/${{ version }}/libpsl-${{ version }}.tar.gz + sha256: c45c3aa17576b99873e05a9b09a44041b065bbfa390e6d474d06fbfaeb9c7722 + +build: + number: ${{ build_number }} + +outputs: + - package: + name: libpsl + version: ${{ version }} + build: + script: build + files: + - ${{ "Library/" if win }}include/libpsl.h + - ${{ "Library/" if win }}lib/pkgconfig/libpsl.pc + - if: linux + then: + - lib/libpsl.so* + - if: osx + then: + - lib/libpsl*.dylib + - if: win + then: + - Library/bin/psl-*.dll + - Library/lib/psl.lib + requirements: + run_exports: + # Just a guess + - ${{ pin_subpackage('libpsl', upper_bound='x.x') }} + build: + - ${{ compiler('c') }} + - ${{ stdlib("c") }} + - ${{ compiler('cxx') }} + - ninja + - pkg-config + - meson + host: + - icu + tests: + - script: + - if: unix + then: + - test -f ${PREFIX}/include/libpsl.h + - test -f ${PREFIX}/lib/pkgconfig/libpsl.pc + - test -f ${PREFIX}/lib/libpsl${SHLIB_EXT} + - test ! -f ${PREFIX}/lib/libpsl.a + - if: win + then: + - if not exist %LIBRARY_PREFIX%\include\libpsl.h (exit 1) + - if not exist %LIBRARY_PREFIX%\lib\pkgconfig\libpsl.pc (exit 1) + - if not exist %LIBRARY_PREFIX%\bin\psl-*.dll (exit 1) + - if not exist %LIBRARY_PREFIX%\lib\psl.lib (exit 1) + - if exist %LIBRARY_PREFIX%\lib\libpsl.a (exit 1) + - package: + name: libpsl-static + version: ${{ version }} + build: + script: build + files: + - ${{ "Library/" if win }}lib/libpsl.a + requirements: + run_exports: + - ${{ pin_subpackage('libpsl', exact=True) }} + build: + - ${{ compiler('c') }} + - ${{ stdlib("c") }} + - ${{ compiler('cxx') }} + - ninja + - pkg-config + - meson + tests: + - script: + - if: unix + then: + - test ! -f ${PREFIX}/include/libpsl.h + - test ! -f ${PREFIX}/lib/pkgconfig/libpsl.pc + - test ! -f ${PREFIX}/lib/libpsl${SHLIB_EXT} + - test -f ${PREFIX}/lib/libpsl.a + - if: win + then: + - if exist %LIBRARY_PREFIX%\include\libpsl.h (exit 1) + - if exist %LIBRARY_PREFIX%\lib\pkgconfig\libpsl.pc (exit 1) + - if exist %LIBRARY_PREFIX%\bin\psl-*.dll (exit 1) + - if exist %LIBRARY_PREFIX%\lib\psl.lib (exit 1) + - if not exist %LIBRARY_PREFIX%\lib\libpsl.a (exit 1) +about: + homepage: https://github.com/rockdaboot/libpsl + repository: https://github.com/rockdaboot/libpsl + license: MIT + license_family: MIT + license_file: LICENSE + summary: A C library to handle the Public Suffix List + +extra: + recipe-maintainers: + - tschoonj From 1201cd4874e8599a8f2845e5761dab92853bc6e1 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 24 Jul 2026 12:50:16 +0200 Subject: [PATCH 2/5] Triggers CI From 116343cf4179854165f39d8944efb62b011aa369 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 27 Jul 2026 09:56:03 -0700 Subject: [PATCH 3/5] Update recipe.yaml to modify run_exports Move 'pin_subpackage' from 'run_exports' to 'run' section. --- recipe/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 492340f..33efe31 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -68,8 +68,6 @@ outputs: files: - ${{ "Library/" if win }}lib/libpsl.a requirements: - run_exports: - - ${{ pin_subpackage('libpsl', exact=True) }} build: - ${{ compiler('c') }} - ${{ stdlib("c") }} @@ -77,6 +75,8 @@ outputs: - ninja - pkg-config - meson + run: + - ${{ pin_subpackage('libpsl', exact=True) }} tests: - script: - if: unix From 9bc492e1308de94258b11bccefb2ef79f4532e7f Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Tue, 28 Jul 2026 15:28:20 +0200 Subject: [PATCH 4/5] Removed non-existence tests since files are installed from dependency --- recipe/recipe.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 33efe31..c2d6152 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -81,16 +81,9 @@ outputs: - script: - if: unix then: - - test ! -f ${PREFIX}/include/libpsl.h - - test ! -f ${PREFIX}/lib/pkgconfig/libpsl.pc - - test ! -f ${PREFIX}/lib/libpsl${SHLIB_EXT} - test -f ${PREFIX}/lib/libpsl.a - if: win then: - - if exist %LIBRARY_PREFIX%\include\libpsl.h (exit 1) - - if exist %LIBRARY_PREFIX%\lib\pkgconfig\libpsl.pc (exit 1) - - if exist %LIBRARY_PREFIX%\bin\psl-*.dll (exit 1) - - if exist %LIBRARY_PREFIX%\lib\psl.lib (exit 1) - if not exist %LIBRARY_PREFIX%\lib\libpsl.a (exit 1) about: homepage: https://github.com/rockdaboot/libpsl From b23e4266e48946438d690fa18979ed3216c3751d Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Wed, 29 Jul 2026 17:51:38 +0200 Subject: [PATCH 5/5] Fixed conflicts --- recipe/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index c2d6152..02a5c42 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -96,3 +96,4 @@ about: extra: recipe-maintainers: - tschoonj + - JohanMabille