From 8a08220d29e638d445f7cb439d3525bd132a8c8d Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 11 Jul 2024 12:54:37 +0300 Subject: [PATCH 01/15] Rebuild against libxml2 2.13 --- abs.yaml | 5 ++++- recipe/meta.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/abs.yaml b/abs.yaml index b4634381..d3d5ccb7 100644 --- a/abs.yaml +++ b/abs.yaml @@ -2,4 +2,7 @@ build_parameters: - "--suppress-variables" -aggregate_branch: 3.12 +aggregate_branch: libxml_2.13.1 + +channels: + - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/e578f96 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5c53308..13d8ead8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: patches: - patches/0001-FindSPATIALITE.patch build: - number: 4 + number: 5 # never be built on s390x skip: True # [linux and s390x] skip: True # [py<36] From 1d50e4b0ea608d3725dc07d1ad4df6aed463a209 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 11 Jul 2024 13:03:06 +0300 Subject: [PATCH 02/15] Use poopler 22.12.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 13d8ead8..1cdc9393 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -58,7 +58,7 @@ requirements: - openjpeg - openssl {{ openssl }} - pcre2 - - poppler + - poppler 22.12.0 - proj # qhull disabled because of https://github.com/conda-forge/qgis-feedstock/issues/284#issuecomment-1356490896 # - qhull @@ -122,7 +122,7 @@ outputs: - openjpeg - openssl {{ openssl }} - pcre2 - - poppler + - poppler 22.12.0 - proj # qhull disabled because of https://github.com/conda-forge/qgis-feedstock/issues/284#issuecomment-1356490896 # - qhull From 3934cdec09474e46f2f76456408ee502a7ce288e Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 11 Jul 2024 13:05:41 +0300 Subject: [PATCH 03/15] Use fontconfig from the staging channel --- abs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/abs.yaml b/abs.yaml index d3d5ccb7..b9097ef7 100644 --- a/abs.yaml +++ b/abs.yaml @@ -6,3 +6,4 @@ aggregate_branch: libxml_2.13.1 channels: - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/e578f96 + - https://staging.continuum.io/prefect/fs/fontconfig-feedstock/pr11/5221e48 From 065e39ff269166b832dce5f4ef9b05fd482a0e1a Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 11 Jul 2024 13:08:25 +0300 Subject: [PATCH 04/15] Use gettext from the staging channel --- abs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/abs.yaml b/abs.yaml index b9097ef7..ec8fe6da 100644 --- a/abs.yaml +++ b/abs.yaml @@ -7,3 +7,4 @@ aggregate_branch: libxml_2.13.1 channels: - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/e578f96 - https://staging.continuum.io/prefect/fs/fontconfig-feedstock/pr11/5221e48 + - https://staging.continuum.io/prefect/fs/gettext-feedstock/pr6/c7dfc15 From f0eb4b1b04c388873076b8c782d1def37bdf04a5 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Fri, 26 Jul 2024 14:39:36 +0300 Subject: [PATCH 05/15] Add patches --- recipe/conda_build_config.yaml | 20 +++++++------- recipe/meta.yaml | 7 ++++- ...9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch | 22 +++++++++++++++ ...f6d6dfe944f59dc5454d01b4d000d9479c02.patch | 27 +++++++++++++++++++ 4 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch create mode 100644 recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 15af3001..f0c4f78d 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,10 +1,12 @@ -MACOSX_SDK_VERSION: # [osx and x86_64] +macos_min_version: + - 10.14 # [osx and x86_64] + - 12.3 # [osx and arm64] +MACOSX_DEPLOYMENT_TARGET: + - 10.14 # [osx and x86_64] + - 12.3 # [osx and arm64] +MACOSX_SDK_VERSION: # [osx] - "10.14" # [osx and x86_64] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.14" # [osx and x86_64] -CONDA_BUILD_SYSROOT: # [osx and x86_64] - - /opt/MacOSX10.10.sdk # [osx and x86_64] -c_compiler: # [win] - - vs2019 # [win] -cxx_compiler: # [win] - - vs2019 # [win] + - "12.3" # [osx and arm64] +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.10.sdk # [osx and x86_64] + - /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk # [osx and arm64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1cdc9393..53c153b5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,6 +9,11 @@ source: sha256: 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 patches: - patches/0001-FindSPATIALITE.patch + # Fix build error with libxml2 2.12. Fixed in gdal v3.9.0, + # see https://github.com/OSGeo/gdal/issues/8746 + - patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch + - patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch + build: number: 5 # never be built on s390x @@ -53,7 +58,7 @@ requirements: - libtiff - libuuid # [linux] - libwebp-base - - libxml2 {{ libxml2 }} + - libxml2 2.13 - lz4-c - openjpeg - openssl {{ openssl }} diff --git a/recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch b/recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch new file mode 100644 index 00000000..606dc3e0 --- /dev/null +++ b/recipe/patches/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa.patch @@ -0,0 +1,22 @@ +From cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 18 Nov 2023 15:38:46 +0100 +Subject: [PATCH] Fix build error with libxml2 2.12 + +--- + port/cpl_xml_validate.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp +index 7eb49ff40c90..29070d957b65 100644 +--- a/port/cpl_xml_validate.cpp ++++ b/port/cpl_xml_validate.cpp +@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const char *msg, ...) + + if (strstr(pszStr, "since this namespace was already imported") == nullptr) + { +- xmlErrorPtr pErrorPtr = xmlGetLastError(); ++ const xmlError *pErrorPtr = xmlGetLastError(); + const char *pszFilename = static_cast(ctx); + char *pszStrDup = CPLStrdup(pszStr); + int nLen = static_cast(strlen(pszStrDup)); diff --git a/recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch b/recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch new file mode 100644 index 00000000..410b79e2 --- /dev/null +++ b/recipe/patches/ec33f6d6dfe944f59dc5454d01b4d000d9479c02.patch @@ -0,0 +1,27 @@ +From ec33f6d6dfe944f59dc5454d01b4d000d9479c02 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 18 Nov 2023 16:33:25 +0100 +Subject: [PATCH] Fix build error with libxml2 2.12 (cont'd) + +--- + gcore/gdaljp2metadatagenerator.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp +index b6caa2db9def..751fa3d5e9dd 100644 +--- a/gcore/gdaljp2metadatagenerator.cpp ++++ b/gcore/gdaljp2metadatagenerator.cpp +@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString &osTemplate, + /************************************************************************/ + + static void GDALGMLJP2XPathErrorHandler(void * /* userData */, +- xmlErrorPtr error) ++#if LIBXML_VERSION >= 21200 ++ const xmlError *error ++#else ++ xmlErrorPtr error ++#endif ++) + { + if (error->domain == XML_FROM_XPATH && error->str1 != nullptr && + error->int1 < static_cast(strlen(error->str1))) From 679e1d40bac33feb8adb1588518859e44d940335 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Fri, 26 Jul 2024 16:04:54 +0300 Subject: [PATCH 06/15] Revert cbc.yaml --- abs.yaml | 1 + recipe/conda_build_config.yaml | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/abs.yaml b/abs.yaml index ec8fe6da..12603705 100644 --- a/abs.yaml +++ b/abs.yaml @@ -8,3 +8,4 @@ channels: - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/e578f96 - https://staging.continuum.io/prefect/fs/fontconfig-feedstock/pr11/5221e48 - https://staging.continuum.io/prefect/fs/gettext-feedstock/pr6/c7dfc15 + - https://staging.continuum.io/prefect/fs/libxml2-feedstock/pr17/1c2e862 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f0c4f78d..e7a22da8 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,12 +1,6 @@ -macos_min_version: - - 10.14 # [osx and x86_64] - - 12.3 # [osx and arm64] -MACOSX_DEPLOYMENT_TARGET: - - 10.14 # [osx and x86_64] - - 12.3 # [osx and arm64] -MACOSX_SDK_VERSION: # [osx] +MACOSX_SDK_VERSION: # [osx and x86_64] - "10.14" # [osx and x86_64] - - "12.3" # [osx and arm64] -CONDA_BUILD_SYSROOT: - - /opt/MacOSX10.10.sdk # [osx and x86_64] - - /Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk # [osx and arm64] +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.14" # [osx and x86_64] +CONDA_BUILD_SYSROOT: # [osx and x86_64] + - /opt/MacOSX10.10.sdk # [osx and x86_64] From 2ef5b29abfb8f9155f42bdf9af92665126d96f54 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Tue, 30 Jul 2024 09:44:55 +0300 Subject: [PATCH 07/15] Update the staging channels --- abs.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs.yaml b/abs.yaml index 12603705..635efdeb 100644 --- a/abs.yaml +++ b/abs.yaml @@ -5,7 +5,7 @@ build_parameters: aggregate_branch: libxml_2.13.1 channels: - - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/e578f96 - - https://staging.continuum.io/prefect/fs/fontconfig-feedstock/pr11/5221e48 - - https://staging.continuum.io/prefect/fs/gettext-feedstock/pr6/c7dfc15 + - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/2acebfd + - https://staging.continuum.io/prefect/fs/fontconfig-feedstock/pr11/3322e36 + - https://staging.continuum.io/prefect/fs/gettext-feedstock/pr6/c7aa8c4 - https://staging.continuum.io/prefect/fs/libxml2-feedstock/pr17/1c2e862 From a1047455208543af362044ec3d57763c91f2200f Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 31 Jul 2024 10:17:13 +0300 Subject: [PATCH 08/15] Use pin from cbc.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 53c153b5..e2c82dc7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -58,7 +58,7 @@ requirements: - libtiff - libuuid # [linux] - libwebp-base - - libxml2 2.13 + - libxml2 {{ libxml2 }} - lz4-c - openjpeg - openssl {{ openssl }} From 2464d8b30ae63235462af9b635bc7425da822e43 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 1 Aug 2024 10:25:53 +0300 Subject: [PATCH 09/15] Use pinnings from cbc.yaml --- recipe/meta.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e2c82dc7..a6c30303 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,44 +36,44 @@ requirements: host: - blosc - cfitsio - - expat + - expat {{ expat }} - freexl - - geos - - geotiff - - giflib # [not win] - - hdf4 - - hdf5 1.12.1 - - jpeg + - geos {{ geos }} + - geotiff {{ geos }} + - giflib {{ giflib }} # [not win] + - hdf4 {{ hdf4 }} + - hdf5 {{ hdf5 }} + - jpeg {{ jpeg }} - json-c # [not win] - kealib - lerc - - libcurl 8.1.1 + - libcurl {{ libcurl }} - libdeflate 1.17 - libiconv - libkml - - libnetcdf 4.8.1 - - libpng + - libnetcdf {{ libnetcdf }} + - libpng {{ libpng }} - libpq 12.15 - libspatialite - - libtiff + - libtiff {{ libtiff }} - libuuid # [linux] - libwebp-base - libxml2 {{ libxml2 }} - lz4-c - - openjpeg + - openjpeg {{ openjpeg }} - openssl {{ openssl }} - pcre2 - poppler 22.12.0 - - proj + - proj {{ proj }} # qhull disabled because of https://github.com/conda-forge/qgis-feedstock/issues/284#issuecomment-1356490896 # - qhull - - sqlite + - sqlite {{ sqlite }} - swig - tiledb 2.3.3 - xerces-c - - xz - - zlib - - zstd + - xz {{ xz }} + - zlib {{ zlib }} + - zstd {{ zstd }} outputs: - name: libgdal From dbf8b482b0fcfbd299fa9afcf569ec5028365c12 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 1 Aug 2024 10:33:25 +0300 Subject: [PATCH 10/15] Use pinnings from cbc.yaml --- recipe/meta.yaml | 70 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a6c30303..8432baaf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,7 +39,7 @@ requirements: - expat {{ expat }} - freexl - geos {{ geos }} - - geotiff {{ geos }} + - geotiff {{ getiff }} - giflib {{ giflib }} # [not win] - hdf4 {{ hdf4 }} - hdf5 {{ hdf5 }} @@ -100,43 +100,43 @@ outputs: host: - blosc - cfitsio - - expat + - expat {{ expat }} - freexl - - geos - - geotiff - - giflib # [not win] - - hdf4 - - hdf5 1.12.1 - - jpeg + - geos {{ geos }} + - geotiffgeotiff {{ geotiff }} + - giflib {{ giflib }} # [not win] + - hdf4 {{ hdf4 }} + - hdf5 {{ hdf5 }} + - jpeg {{ jpeg }} - json-c # [not win] - kealib - lerc - - libcurl 8.1.1 + - libcurl {{ libcurl }} - libdeflate 1.17 - libiconv - libkml - - libnetcdf 4.8.1 - - libpng + - libnetcdf {{ libnetcdf }} + - libpng {{ libpng }} - libpq 12.15 - libspatialite - - libtiff + - libtiff {{ libtiff }} - libuuid # [linux] - libwebp-base - libxml2 {{ libxml2 }} - lz4-c - - openjpeg + - openjpeg {{ openjpeg }} - openssl {{ openssl }} - pcre2 - poppler 22.12.0 - - proj + - proj {{ proj }} # qhull disabled because of https://github.com/conda-forge/qgis-feedstock/issues/284#issuecomment-1356490896 # - qhull - - sqlite + - sqlite {{ sqlite }} - tiledb 2.3.3 - xerces-c - - xz - - zlib - - zstd + - xz {{ xz }} + - zlib {{ zlib }} + - zstd {{ zstd }} run: - cfitsio @@ -196,39 +196,39 @@ outputs: - blosc - cfitsio - curl - - expat + - expat {{ expat }} - freexl - - geos - - geotiff - - giflib # [not win] - - hdf4 - - hdf5 1.12.1 - - jpeg + - geos {{ geos }} + - geotiffgeotiff {{ geotiff }} + - giflib {{ giflib }} # [not win] + - hdf4 {{ hdf4 }} + - hdf5 {{ hdf5 }} + - jpeg {{ jpeg }} - json-c # [not win] - kealib - arrow-cpp - libkml - - libnetcdf - - libpng + - libnetcdf {{ libnetcdf }} + - libpng {{ libpng }} - libpq - libspatialite - - libtiff + - libtiff {{ libtiff }} - libuuid # [linux] - libwebp-base - libxml2 {{ libxml2 }} - - openjpeg + - openjpeg {{ openjpeg }} - openssl {{ openssl }} - pcre2 - poppler - postgresql - - proj + - proj {{ proj }} - qhull - - sqlite + - sqlite {{ sqlite }} - tiledb - xerces-c - - xz - - zlib - - zstd + - xz {{ xz }} + - zlib {{ zlib }} + - zstd {{ zstd }} run: - {{ pin_subpackage('libgdal', max_pin='x.x.x', exact=True) }} @@ -290,7 +290,7 @@ outputs: - openssl {{openssl }} # Only required to produce all openssl variants. - {{ pin_subpackage('libgdal', max_pin='x.x.x', exact=True) }} # Without this, the solver is having a hard time resolving the correct dependencies... - - openjpeg + - openjpeg {{ openjpeg }} run: - python - {{ pin_compatible('numpy') }} From d2b6118871aadeee1a943820ae2315722254a5c0 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 1 Aug 2024 10:37:44 +0300 Subject: [PATCH 11/15] Fix geotiff typo --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8432baaf..9e50efe4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,7 +39,7 @@ requirements: - expat {{ expat }} - freexl - geos {{ geos }} - - geotiff {{ getiff }} + - geotiff - giflib {{ giflib }} # [not win] - hdf4 {{ hdf4 }} - hdf5 {{ hdf5 }} @@ -103,7 +103,7 @@ outputs: - expat {{ expat }} - freexl - geos {{ geos }} - - geotiffgeotiff {{ geotiff }} + - geotiff - giflib {{ giflib }} # [not win] - hdf4 {{ hdf4 }} - hdf5 {{ hdf5 }} @@ -199,7 +199,7 @@ outputs: - expat {{ expat }} - freexl - geos {{ geos }} - - geotiffgeotiff {{ geotiff }} + - geotiff - giflib {{ giflib }} # [not win] - hdf4 {{ hdf4 }} - hdf5 {{ hdf5 }} From 7f3644d9d5502ee070b22fd0713e3aa2fcec50f4 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 1 Aug 2024 18:24:33 +0300 Subject: [PATCH 12/15] Remove local cbc.yaml --- recipe/conda_build_config.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index e7a22da8..00000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.14" # [osx and x86_64] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.14" # [osx and x86_64] -CONDA_BUILD_SYSROOT: # [osx and x86_64] - - /opt/MacOSX10.10.sdk # [osx and x86_64] From ef30dd6d009c1576e6a1b2a56392668332026833 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 1 Aug 2024 19:56:14 +0300 Subject: [PATCH 13/15] Revert "Remove local cbc.yaml" This reverts commit 7f3644d9d5502ee070b22fd0713e3aa2fcec50f4. --- recipe/conda_build_config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..e7a22da8 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,6 @@ +MACOSX_SDK_VERSION: # [osx and x86_64] + - "10.14" # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.14" # [osx and x86_64] +CONDA_BUILD_SYSROOT: # [osx and x86_64] + - /opt/MacOSX10.10.sdk # [osx and x86_64] From 6b8b7e85197e2605d0a4d68314e23df61ef3d7b9 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 1 Aug 2024 19:58:15 +0300 Subject: [PATCH 14/15] Add a comment about MacOSX SDK 10.14 --- recipe/conda_build_config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e7a22da8..e0561c81 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,5 @@ +# Use MacOSX SDK v10.14 because v10.10 fails with an error: +# #file not found: /usr/lib/system/libsystem_coretls.dylib for architecture x86_64" MACOSX_SDK_VERSION: # [osx and x86_64] - "10.14" # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] From 29e7fa1e50b19882b103e2e55eb57d6431588d18 Mon Sep 17 00:00:00 2001 From: skupr-anaconda <79282962+skupr-anaconda@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:49:54 +0300 Subject: [PATCH 15/15] Update abs.yaml --- abs.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/abs.yaml b/abs.yaml index 635efdeb..fdc4a2a5 100644 --- a/abs.yaml +++ b/abs.yaml @@ -1,11 +1,3 @@ # the conda-build parameters to use for disabling --skip-existing build_parameters: - "--suppress-variables" - -aggregate_branch: libxml_2.13.1 - -channels: - - https://staging.continuum.io/prefect/fs/libspatialite-feedstock/pr11/2acebfd - - https://staging.continuum.io/prefect/fs/fontconfig-feedstock/pr11/3322e36 - - https://staging.continuum.io/prefect/fs/gettext-feedstock/pr6/c7aa8c4 - - https://staging.continuum.io/prefect/fs/libxml2-feedstock/pr17/1c2e862