From 011bb36f5e4c7084cdcb9e8e1833e65146f329a4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:17:07 +0000 Subject: [PATCH 1/4] Rebuild for harfbuzz 9 --- .ci_support/migrations/harfbuzz9.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/harfbuzz9.yaml diff --git a/.ci_support/migrations/harfbuzz9.yaml b/.ci_support/migrations/harfbuzz9.yaml new file mode 100644 index 0000000..0216ea6 --- /dev/null +++ b/.ci_support/migrations/harfbuzz9.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for harfbuzz 9 + kind: version + migration_number: 1 +harfbuzz: +- '9' +migrator_ts: 1719592972.538086 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cff5916..824decd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,7 +45,7 @@ source: sha256: cf112b96b665eb34107590c83af83e56735caa677e2a96d1991419aa26b5d511 # [win64] build: - number: 0 + number: 1 requirements: build: From a0744b2f68b9feeb4c27ec63a910775a04820872 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:18:11 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.19.57.36 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 10 ++++------ .ci_support/osx_arm64_.yaml | 8 +++----- .ci_support/win_64_.yaml | 2 -- .gitattributes | 4 ++-- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ 11 files changed, 35 insertions(+), 22 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a626..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 5cb65b4..ae2c554 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -27,7 +27,7 @@ freetype: giflib: - '5.2' harfbuzz: -- '8' +- '9' lcms2: - '2' libjpeg_turbo: @@ -42,4 +42,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 36365cd..d713283 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -31,7 +31,7 @@ freetype: giflib: - '5.2' harfbuzz: -- '8' +- '9' lcms2: - '2' libjpeg_turbo: @@ -46,4 +46,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 22f1f64..e547113 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -27,7 +27,7 @@ freetype: giflib: - '5.2' harfbuzz: -- '8' +- '9' lcms2: - '2' libjpeg_turbo: @@ -42,4 +42,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b2144ce..2a553a1 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,13 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' channel_sources: - conda-forge channel_targets: @@ -24,4 +22,4 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index ab83120..56a6c9b 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,13 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' channel_sources: - conda-forge channel_targets: @@ -24,4 +22,4 @@ zip_keys: - - c_compiler_version - cxx_compiler_version zlib: -- '1.2' +- '1' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 239ff10..e717348 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,3 @@ -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 0a2e719..6e5bc56 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -80,6 +80,13 @@ else --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:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --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" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" From 3ecfc6ed7b146f53e1efb0f07f3cd16de1887f8e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 6 Sep 2023 13:05:45 +1100 Subject: [PATCH 3/4] avoid libcxx dependence on osx --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 824decd..bec5be0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,6 +46,10 @@ source: build: number: 1 + ignore_run_exports: + # the produced artefacts still need libc++.*.dylib on osx, + # but the one in the platform sdk is enough; avoid extra run-export + - libcxx # [osx] requirements: build: From e8ddd427be2a1dd12117e9097907fde020583823 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 22 Jul 2024 14:55:18 +0200 Subject: [PATCH 4/4] Skip binary_reloaction on osx --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bec5be0..e3c5b7f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,6 +46,10 @@ source: build: number: 1 + # Binaries are already relocatable and conda-build's post-processing would add a very long RPATH to binaries + # which doesn't fit anymore into the __LINKEDIT section. For this, we either need to manually reassemble + # the Mach-O header or build everything from source. + binary_relocation: false # [osx] ignore_run_exports: # the produced artefacts still need libc++.*.dylib on osx, # but the one in the platform sdk is enough; avoid extra run-export