[gtk-osx] Fix glib build on modulesets and modulesets-unstable.



commit d4721a4413119b7de32997c55446d1eacc68d5f4
Author: John Ralls <jralls ceridwen us>
Date:   Thu Aug 6 12:32:04 2020 -0700

    Fix glib build on modulesets and modulesets-unstable.

 modulesets-unstable/gtk-osx.modules | 2 +-
 modulesets/gtk-osx.modules          | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 7bd5094..9510c62 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -67,7 +67,7 @@
     </after>
   </metamodule>
 
-  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=false">
+  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled">
     <branch/>
     <dependencies>
       <dep package="libffi"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 560f4b6..18f9d92 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -67,15 +67,12 @@
     </after>
   </metamodule>
 
-  <autotools id="glib" autogenargs="--with-pcre=internal">
+  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled">
     <branch tag="glib-2-64"/>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
-  </autotools>
+  </meson>
 
   <autotools id="libffi" autogenargs="--disable-builddir"
              autogen-sh="autoreconf" supports-non-srcdir-builds="no">


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