sleef dep by pkg-config first

Author: SwayamInSync

quaddtype/meson.build

@@ -8,16 +8,29 @@ c = meson.get_compiler('c')
 # Get the conda prefix
 conda_prefix = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: true).stdout().strip()
 
-# Add conda lib directory to library path
+message('Conda prefix: ' + conda_prefix)
+
+# Add conda lib and include directories
 add_project_link_arguments('-L' + conda_prefix + '/lib', language: ['c', 'cpp'])
+add_project_arguments('-I' + conda_prefix + '/include', language: ['c', 'cpp'])
 
-sleef_dep = c.find_library('sleef', dirs: [conda_prefix + '/lib'])
-sleefquad_dep = c.find_library('sleefquad', dirs: [conda_prefix + '/lib'])
+# Try to find SLEEF using pkg-config first
+sleef_dep = dependency('sleef', required: false)
 
-if not sleef_dep.found() or not sleefquad_dep.found()
-    error('SLEEF library not found. Please ensure it is installed in your conda environment\nconda install sleef.')
+if not sleef_dep.found()
+    # If pkg-config fails, try to find the library manually
+    sleef_dep = c.find_library('sleef', dirs: [conda_prefix + '/lib'])
+    sleefquad_dep = c.find_library('sleefquad', dirs: [conda_prefix + '/lib'])
+    
+    if not sleef_dep.found() or not sleefquad_dep.found()
+        error('SLEEF library not found. Please ensure it is installed in your conda environment\nconda install sleef.')
+    endif
+else
+    sleefquad_dep = sleef_dep
 endif
 
+message('SLEEF library found: ' + sleef_dep.found().to_string())
+
 incdir_numpy = run_command(py,
   [
     '-c',
@@ -30,6 +43,7 @@ includes = include_directories(
     [
         incdir_numpy,
         'quaddtype/src',
+        conda_prefix + '/include',
     ]
 )
 
@@ -57,10 +71,11 @@ py.install_sources(
 )
 
 py.extension_module('_quaddtype_main',
-srcs,
-c_args: ['-g', '-O0', '-lsleef', '-lsleefquad'],
-dependencies: [sleef_dep, sleefquad_dep],
-install: true,
-subdir: 'quaddtype',
-include_directories: includes
+    srcs,
+    c_args: ['-g', '-O0'],
+    link_args: ['-lsleef', '-lsleefquad'],
+    dependencies: [sleef_dep, sleefquad_dep],
+    install: true,
+    subdir: 'quaddtype',
+    include_directories: includes
 )

quaddtype/pyproject.toml

@@ -69,14 +69,15 @@ source ~/.bash_profile
 conda config --set always_yes yes --set changeps1 no
 conda update -q conda
 conda info -a
-conda install -y -c conda-forge sleef
+conda install -y -c conda-forge sleef pkg-config
 if [ ! -f "$HOME/miniconda/include/sleef.h" ]; then
     echo "sleef.h not found. Installation may have failed."
     exit 1
 fi
 ls -l $HOME/miniconda/include/sleef.h
+ls -l $HOME/miniconda/lib/libsleef*
 
-# Adding a pkg-config file for SLEEF
+# Create a pkg-config file for SLEEF
 cat << EOF > $HOME/miniconda/lib/pkgconfig/sleef.pc
 prefix=$HOME/miniconda
 libdir=${prefix}/lib
@@ -85,14 +86,14 @@ includedir=${prefix}/include
 Name: SLEEF
 Description: SLEEF library
 Version: 3.5.1
-Libs: -L${libdir} -lsleef
+Libs: -L${libdir} -lsleef -lsleefquad
 Cflags: -I${includedir}
 EOF
 
-
-export PKG_CONFIG_PATH="$HOME/miniconda/lib/pkgconfig:$PKG_CONFIG_PATH"
+export PKG_CONFIG_PATH="$HOME/minoconda/lib/pkgconfig:$PKG_CONFIG_PATH"
+pkg-config --libs --cflags sleef
 """
-environment = {DYLD_LIBRARY_PATH = "$HOME/miniconda/lib:$DYLD_LIBRARY_PATH", LIBRARY_PATH = "$HOME/miniconda/lib:$LIBRARY_PATH", CFLAGS = "-I$HOME/miniconda/include $CFLAGS", CXXFLAGS = "-I$HOME/miniconda/include $CXXFLAGS", LDFLAGS = "-L$HOME/miniconda/lib $LDFLAGS", PKG_CONFIG_PATH = "$HOME/miniconda/lib/pkgconfig:$PKG_CONFIG_PATH"}
+environment = {DYLD_LIBRARY_PATH = "$HOME/miniconda/lib:$DYLD_LIBRARY_PATH", LIBRARY_PATH = "$HOME/miniconda/lib:$LIBRARY_PATH", CFLAGS = "-I$HOME/miniconda/include $CFLAGS", CXXFLAGS = "-I$HOME/miniconda/include $CXXFLAGS", LDFLAGS = "-L$HOME/miniconda/lib $LDFLAGS", PKG_CONFIG_PATH = "$HOME/miniconda/lib/pkgconfig:$PKG_CONFIG_PATH", CONDA_PREFIX = "$HOME/miniconda"}
 repair-wheel-command = "delocate-wheel -w {dest_dir} -v {wheel}"
 
 # [tool.cibuildwheel.windows]