add sysroot for linux

fredboudon · Jan 23, 2024 · 65faf86 · 65faf86
1 parent 94153da
commit 65faf86
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -49,14 +49,6 @@ requirements:
     - libxcb                             # [linux]
     - pthread-stubs                      # [linux]
     - {{ cdt('mesa-libgl-devel') }}      # [linux]
-    - {{ cdt('mesa-libgl-devel') }}      # [linux]
-    - {{ cdt('mesa-dri-drivers') }}      # [linux]
-    - {{ cdt('libxext') }}               # [linux]
-    - {{ cdt('libselinux') }}            # [linux]
-    - {{ cdt('libxdamage') }}            # [linux]
-    - {{ cdt('libxxf86vm') }}            # [linux]
-    - {{ cdt('libxfixes') }}             # [linux]
-    - {{ cdt('libxcb') }}                # [linux]
     - xorg-libxfixes                    # [linux]
 
 

diff --git 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','-nostdinc++','-nostdinc'] # '--sysroot=${BUILD_PREFIX}/${HOST}/sysroot']
+extra-compile-args=['-I${CONDA_PREFIX}/include','-I${PREFIX}/include','-I${BUILD_PREFIX}/${HOST}/sysroot/usr/include','-nostdinc++','-nostdinc', '--sysroot=${BUILD_PREFIX}/${HOST}/sysroot']
 extra-link-args=['-L${CONDA_PREFIX}/lib','-L${PREFIX}/lib','--sysroot=${BUILD_PREFIX}/${HOST}/sysroot']
 
 [tool.sip.project]