[gtk-osx] Change Zlib build to cmake.



commit 79f3730c5cd0e6d5e4be2915f6b507a8d43ebc80
Author: John Ralls <jralls ceridwen us>
Date:   Sat Apr 2 14:46:04 2022 -0700

    Change Zlib build to cmake.
    
    Better than a hand-rolled configure script and isn't broken.
    
    Closes #54.

 modulesets-stable/gtk-osx-network.modules   | 5 ++---
 modulesets-unstable/gtk-osx-network.modules | 5 ++---
 modulesets/gtk-osx-network.modules          | 7 +++----
 3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 79eb609..d66a985 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -72,12 +72,11 @@
     </branch>
   </autotools>
 
-  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
-             supports-non-srcdir-builds="no">
+  <cmake id="zlib">
     <branch repo="zlib" version="1.2.12"
             module="zlib-1.2.12.tar.xz"
             hash="sha256:7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"/>
-  </autotools>
+  </cmake>
 
   <autotools id="p11-kit" autogen-sh="configure"
              autogenargs="--without-trust-paths">
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index e8c72a6..410cc53 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -63,12 +63,11 @@
 
   </autotools>
 
-  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
-             supports-non-srcdir-builds="no">
+  <cmake id="zlib">
     <branch repo="sourceforge" version="1.2.12"
             module="libpng/zlib-1.2.12.tar.xz"
             hash="sha256:7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"/>
-  </autotools>
+  </cmake>
 
   <autotools id="p11-kit" autogen-sh="configure"
              autogenargs="--without-trust-paths">
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index d203c96..8246413 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -62,12 +62,11 @@
     </branch>
   </autotools>
 
-  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
-             supports-non-srcdir-builds="no">
-    <branch repo="sourceforge" version="1.2.12"
+  <cnake id="zlib">
+    <branch repo="zlib" version="1.2.12"
             module="libpng/zlib-1.2.12.tar.xz"
             hash="sha256:7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"/>
-  </autotools>
+  </cnake>
 
   <autotools id="p11-kit" autogen-sh="configure"
              autogenargs="--without-trust-paths">


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