diff --git a/conda/build.sh b/conda/build.sh index e79fab8..90f04c7 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -17,10 +17,10 @@ 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}" + # export SYSROOT="${CONDA_BUILD_SYSROOT}" fi alias qmake='${CONDA_PREFIX}/bin/qmake' diff --git a/pyproject-linux.toml b/pyproject-linux.toml index f1126d1..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,19 +13,19 @@ 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'] -qmake-CONFIG = ['c++14'] +#qmake-CONFIG = ['c++14'] 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] sip-module="PyQt5.sip" -abi-version='12.8' +#abi-version='12.8'