From 360f0354373dc4e6b65be992054dbed5184ad7f9 Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 15:44:04 +0200 Subject: [PATCH 1/8] try conda_build_sysroot --- pyproject-linux.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject-linux.toml b/pyproject-linux.toml index f1126d1..742dd25 100644 --- a/pyproject-linux.toml +++ b/pyproject-linux.toml @@ -22,7 +22,7 @@ libraries = ['QGLViewer','GLU'] tags = ['QGLViewer_2_9_1'] #include-dirs=['${CONDA_PREFIX}/include','${PREFIX}/include'] #library-dirs=['${CONDA_PREFIX}/lib','${PREFIX}/lib'] -extra-compile-args=['-I${CONDA_PREFIX}/include','-I${PREFIX}/include','-I${BUILD_PREFIX}/${HOST}/sysroot/usr/include'] +extra-compile-args=['-I${CONDA_PREFIX}/include','-I${PREFIX}/include','-I${CONDA_BUILD_SYSROOT}/usr/include'] extra-link-args=['-L${CONDA_PREFIX}/lib','-L${PREFIX}/lib'] [tool.sip.project] From 777ffb99ba1529874021b10e0b80fd30d1608164 Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 15:55:32 +0200 Subject: [PATCH 2/8] remove c++14 --- pyproject-linux.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject-linux.toml b/pyproject-linux.toml index 742dd25..19dc0bc 100644 --- a/pyproject-linux.toml +++ b/pyproject-linux.toml @@ -17,7 +17,7 @@ requires-dist = "PyQt5 (>=5.12)" [tool.sip.bindings.PyQGLViewer] qmake-QT = ['xml opengl gui widgets'] -qmake-CONFIG = ['c++14'] +#qmake-CONFIG = ['c++14'] libraries = ['QGLViewer','GLU'] tags = ['QGLViewer_2_9_1'] #include-dirs=['${CONDA_PREFIX}/include','${PREFIX}/include'] From 4e4de40346f283c2f6f1218201ac8a89be3eeae5 Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 16:02:21 +0200 Subject: [PATCH 3/8] align pyproject --- pyproject-linux.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject-linux.toml b/pyproject-linux.toml index 19dc0bc..74b4046 100644 --- a/pyproject-linux.toml +++ b/pyproject-linux.toml @@ -1,6 +1,6 @@ # Specify the build system. [build-system] -requires = ["sip >=6.0.2, <7", "PyQt-builder >=1.6, <2"] +requires = ["sip", "PyQt-builder"] build-backend = "sipbuild.api" # Specify the PEP 566 metadata for the project. @@ -13,7 +13,7 @@ author = "Frederic Boudon" author-email = "frederic.boudon@cirad.fr" license = "GPL v3" #description-file = "README" -requires-dist = "PyQt5 (>=5.12)" +#requires-dist = "PyQt5 (>=5.12)" [tool.sip.bindings.PyQGLViewer] qmake-QT = ['xml opengl gui widgets'] @@ -27,5 +27,5 @@ extra-link-args=['-L${CONDA_PREFIX}/lib','-L${PREFIX}/lib'] [tool.sip.project] sip-module="PyQt5.sip" -abi-version='12.8' +#abi-version='12.8' From a9c3805c032ed42ab1b7d8f9e1e9b106f75ca20d Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 16:04:38 +0200 Subject: [PATCH 4/8] remove build.sh hack --- conda/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/build.sh b/conda/build.sh index e79fab8..7384df6 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -5,7 +5,7 @@ then export MACOSX_VERSION_MIN=10.9 fi -if [ "$(uname)" == "Linux" ]; +if [ "$(uname)" == "Linuxxxxx" ]; then export QMAKESPEC=linux-g++ mv pyproject-linux.toml pyproject.toml From a573bef85f98a9fc0f0967fde70605d5e3abffdd Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 16:11:50 +0200 Subject: [PATCH 5/8] remove sysroot --- conda/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/build.sh b/conda/build.sh index 7384df6..c74520e 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -5,7 +5,7 @@ then export MACOSX_VERSION_MIN=10.9 fi -if [ "$(uname)" == "Linuxxxxx" ]; +if [ "$(uname)" == "Linux" ]; then export QMAKESPEC=linux-g++ mv pyproject-linux.toml pyproject.toml @@ -20,7 +20,7 @@ then export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) export PATH=${PWD}:${PATH} - export SYSROOT="${CONDA_BUILD_SYSROOT}" + # export SYSROOT="${CONDA_BUILD_SYSROOT}" fi alias qmake='${CONDA_PREFIX}/bin/qmake' From e947edc7660e15a53b023d3cecbaf1690ff2a9a9 Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 16:19:11 +0200 Subject: [PATCH 6/8] remove more lines --- conda/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/build.sh b/conda/build.sh index c74520e..c450c29 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -17,9 +17,9 @@ then export LD=${GXX} export CC=${GCC} export CXX=${GXX} - export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) + # export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) - export PATH=${PWD}:${PATH} + # export PATH=${PWD}:${PATH} # export SYSROOT="${CONDA_BUILD_SYSROOT}" fi From 0c4e4316d32678ad63242fdd4b77278bd54c2cf7 Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 16:27:00 +0200 Subject: [PATCH 7/8] put back pkgconfig --- conda/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/build.sh b/conda/build.sh index c450c29..04d7d24 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -17,7 +17,7 @@ then export LD=${GXX} export CC=${GCC} export CXX=${GXX} - # export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) + export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) # export PATH=${PWD}:${PATH} # export SYSROOT="${CONDA_BUILD_SYSROOT}" From b85756b5179ff79220873cd4ebfc0f2e55cc2de9 Mon Sep 17 00:00:00 2001 From: Christian Fournier Date: Tue, 16 Sep 2025 16:33:21 +0200 Subject: [PATCH 8/8] restore PATH --- conda/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/build.sh b/conda/build.sh index 04d7d24..90f04c7 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -17,9 +17,9 @@ then export LD=${GXX} export CC=${GCC} export CXX=${GXX} - export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) + # export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) - # export PATH=${PWD}:${PATH} + export PATH=${PWD}:${PATH} # export SYSROOT="${CONDA_BUILD_SYSROOT}" fi