diff --git a/conda/build.sh b/conda/build.sh index 3f73cd7..bb50b53 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -1,56 +1,2 @@ #!/bin/bash - -# Inspired from https://github.com/conda-forge/pyqt-feedstock/tree/main/recipe - -if [ "$(uname)" == "Linux" ]; then - # USED_BUILD_PREFIX=${BUILD_PREFIX:-${PREFIX}} - - # ln -s ${GXX} g++ || true - # ln -s ${GCC} gcc || true - # ln -s ${USED_BUILD_PREFIX}/bin/${HOST}-gcc-ar gcc-ar || true - - export LD=${GXX} - export CC=${GCC} - export CXX=${GXX} - export QMAKE_CXX="${CXX}" - export QMAKE_CC="${CC}" - export PKG_CONFIG_EXECUTABLE=$(basename $(which pkg-config)) - -# export PATH=${PWD}:${PATH} -fi - -echo "CC=${CC}" -echo "CXX=${CXX}" -echo "GCC=${GCC}" -echo "GXX=${GXX}" - -which gcc -which g++ - -readlink -f "$(which gcc)" || true -readlink -f "$(which g++)" || true -readlink -f "$GCC" || true -readlink -f "$GXX" || true - -"${CC}" --version -"${CXX}" --version - -"$GXX" -v -E -x c++ /dev/null - -echo "**** BUILD" sip-install --verbose - -echo -echo "****** CHECK PYTHON LIB" - -# To check if Python lib is not in the dependencies with conda-forge distribution. -# See https://github.com/conda-forge/boost-feedstock/issues/81 -if [ $(uname) = "Darwin" ]; then - otool -L $(${PYTHON} -c "import PyQGLViewer as pyqgl ; print(pyqgl.__file__)") -fi - -if [ "$(uname)" == "Linux" ]; then - ldd $(${PYTHON} -c "import PyQGLViewer as pyqgl ; print(pyqgl.__file__)") - -fi -echo "****** END OF BUILD PROCESS" diff --git a/conda/meta.yaml b/conda/meta.yaml index 9d5ead7..b975f81 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -42,7 +42,6 @@ requirements: - pyqt-builder - libgl-devel # [linux] - libxcb # [linux] - - pthread-stubs # [linux] - xorg-libxfixes # [linux] diff --git a/project.py b/project.py index 77dd049..d55f34e 100644 --- a/project.py +++ b/project.py @@ -18,7 +18,7 @@ # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -import os +import platform, os from pyqtbuild import PyQtBindings, PyQtProject @@ -68,9 +68,6 @@ def __init__(self, project): print("Instanciation of the PyQGLViewerBindings ") def apply_user_defaults(self, tool): - import platform, os - - CONDA_PREFIX = os.environ.get('CONDA_PREFIX',None) PREFIX = os.environ.get('PREFIX',None) CONDA_BUILD_SYSROOT = os.environ.get('CONDA_BUILD_SYSROOT',None) @@ -93,7 +90,7 @@ def apply_user_defaults(self, tool): self.libraries.append('QGLViewer2') self.libraries.append('opengl32') self.libraries.append('glu32') - + self.define_macros.append('PYQGLVIEWER_VERSION="'+PYQGLVIEWER_VERSION+'"') super().apply_user_defaults(tool)