[gobject-introspection/wip/meson] meson: add ffi_libdir to glib_libpaths and glib_command



commit c49755bf47ff687ce025edb71cc6cb62a284fced
Author: Havard Graff <havard graff gmail com>
Date:   Mon Dec 4 13:00:21 2017 +0100

    meson: add ffi_libdir to glib_libpaths and glib_command
    
    To make it build using libffi as a subproject on Linux.

 gir/meson.build |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gir/meson.build b/gir/meson.build
index 52838f2..a4c84c9 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -132,7 +132,6 @@ elif dep_type == 'internal'
   gio_libdir = join_paths(meson.build_root(), subprojdir, 'glib', 'gio')
   glib_libpaths = ['-L' + glib_libdir, '-L' + gobject_libdir,
                    '-L' + gmodule_libdir, '-L' + gio_libdir]
-  glib_command += glib_libpaths
   # Includes that will be used to compile the scanner executable
   glib_buildinc = join_paths(meson.build_root(), subprojdir, 'glib')
   gmodule_incdir = join_paths(glibproj_incdir, 'gmodule')
@@ -146,6 +145,12 @@ elif dep_type == 'internal'
   glib_includes += ['-I' + ffi_incdir]
   intl_incdir = join_paths(meson.source_root(), subprojdir, 'proxy-libintl')
   glib_includes += ['-I' + intl_incdir]
+
+  ffi_libdir = join_paths(meson.build_root(), subprojdir, 'libffi', 'src')
+  glib_libpaths = ['-L' + ffi_libdir] + glib_libpaths
+
+  glib_command += glib_libpaths
+
 else
   error('Unknown glib dependency type: ' + dep_type)
 endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]