[gtk-osx] Move readline into the bootstrap module as it is a dependency of bash



commit 68b9323c4bcc38d21edb8daa61f9de44fa4dd8f3
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Feb 21 13:27:16 2016 -0800

    Move readline into the bootstrap module as it is a dependency of bash

 modulesets-stable/bootstrap.modules         |    8 +++++++-
 modulesets-stable/gtk-osx-bootstrap.modules |    6 ------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index f222428..52de494 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -25,7 +25,13 @@
     <branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
   </autotools>
 
-  <autotools id='bash' autogen-sh="configure">
+  <autotools id='readline' autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
+      version="6.3">
+    </branch>
+  </autotools>
+
+  <autotools id='bash' autogen-sh="configure"  autogenargs="--with-installed-readline">
     <branch repo="ftp.gnu.org" module="bash/bash-4.3.30.tar.gz"
             version="4.3.30"/>
     <dependencies>
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index dfa5454..822ec36 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -28,12 +28,6 @@
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
 
-  <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
-           version="6.3">
-    </branch>
-  </autotools>
-
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
     <branch version="1.6.17" module="libpng/libpng-1.6.17.tar.xz"
             repo="sourceforge" md5sum="430a9b76b78533235cd4b9b26ce75c7e"/>


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