Merge pull request #163 from regro-cf-autotick-bot/rebuild-harfbuzz9-…

…0-1_he9de91 [main] Rebuild for harfbuzz 9
conda-forge · Jul 23, 2024 · 7161066 · 7161066
2 parents 8d96ba5 + e8ddd42
commit 7161066
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 23 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git 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
@@ -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
@@ -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/migrations/harfbuzz9.yaml 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/.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
@@ -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
@@ -1,5 +1,3 @@
-c_stdlib:
-- vs
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -45,7 +45,15 @@ source:
     sha256: cf112b96b665eb34107590c83af83e56735caa677e2a96d1991419aa26b5d511  # [win64]
 
 build:
-  number: 0
+  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
+    - libcxx  # [osx]
 
 requirements:
   build: