From 95d752cd9cf61021963fb568d75121191dd2c535 Mon Sep 17 00:00:00 2001 From: coolcoder613eb <96163908+coolcoder613eb@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:12:17 +1100 Subject: [PATCH] haiku_pyapi: update (#11242) * use the smart_holder branch of pybind11 since it provides a feature that we need * only for python 3.10 --- ...u_pyapi-0.2.recipe => haiku_pyapi-0.3.recipe} | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) rename dev-python/haiku-pyapi/{haiku_pyapi-0.2.recipe => haiku_pyapi-0.3.recipe} (80%) diff --git a/dev-python/haiku-pyapi/haiku_pyapi-0.2.recipe b/dev-python/haiku-pyapi/haiku_pyapi-0.3.recipe similarity index 80% rename from dev-python/haiku-pyapi/haiku_pyapi-0.2.recipe rename to dev-python/haiku-pyapi/haiku_pyapi-0.3.recipe index f23d6361a..a496e0526 100644 --- a/dev-python/haiku-pyapi/haiku_pyapi-0.2.recipe +++ b/dev-python/haiku-pyapi/haiku_pyapi-0.3.recipe @@ -14,8 +14,12 @@ COPYRIGHT="2023-2024 Elozor Bruce LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/coolcoder613eb/Haiku-PyAPI/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="a534151ba988a406da5e278db5af127fca257c6b260374be054a385335b779d2" +CHECKSUM_SHA256="3c78f37fc64bd9fbdfedf033f57136dc4f8f05f6872bb60d21c182c1ceddf330" SOURCE_DIR="Haiku-PyAPI-$portVersion" +# pybind11 needs smart_holder branch +srcGitRev="d8b1541168e58444597f25e85e78356de9b67d34" +SOURCE_URI_2="https://github.com/pybind/pybind11/archive/$srcGitRev.zip" +CHECKSUM_SHA256_2="6c6ce8f70f6973f4c128b93f1911d14178cc1ea9e7558f01c8aec6e567a00163" ARCHITECTURES="all !x86_gcc2" @@ -35,7 +39,7 @@ BUILD_PREREQUIRES=" cmd:jam " -PYTHON_VERSIONS=(3.9 3.10) +PYTHON_VERSIONS=(3.10) for i in "${!PYTHON_VERSIONS[@]}"; do pythonVersion=${PYTHON_VERSIONS[$i]} @@ -54,14 +58,16 @@ for i in "${!PYTHON_VERSIONS[@]}"; do haiku$secondaryArchSuffix cmd:python$pythonVersion \"" - BUILD_REQUIRES+=" - pybind11${secondaryArchSuffix}_$pythonPackage - " BUILD_PREREQUIRES+=" cmd:python$pythonVersion " done +BUILD() +{ + cp -rd $sourceDir2/pybind11-$srcGitRev/* \ + ./pybind11/ +} INSTALL() {