[gtk-osx] Build openssl

[John Ralls <jralls src gnome org>]

commit 23ee0fd2d73bf8092f75a2fd3b4bb480f9c8cdf8
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Feb 16 23:23:33 2016 -0800

    Build openssl
    
    El Capitan doesn't supply openssl anymore. Add a recent version to
    gtk-osx-network.modules. It's a dependency of libnettle, though there may
    be other places where it's a hidden dependency.
    
    Skip it on releases prior to El Capitan.

 jhbuildrc-gtk-osx                           |    4 ++++
 modulesets-stable/gtk-osx-network.modules   |    3 ++-
 modulesets-unstable/gtk-osx-network.modules |   12 ++++++++++++
 modulesets/gtk-osx-network.modules          |   12 ++++++++++++
 4 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 6e4f725..e8afd2f 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -372,6 +372,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
     config_shell = os.path.join(prefix, 'bin', 'bash')
     if _osx_version < 11.0:
         skip.append('bash')
+        skip.append('openssl')  # openssl removed in El Capitan
     elif os.path.exists(config_shell):
         os.environ['CONFIG_SHELL'] = config_shell
 
@@ -416,6 +417,9 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
                                   ' -stdlib=libstdc++'}
         append_autogenargs('babl', '--disable-sse')
 
+    # openssl doesn't understand DESTDIR, but luckily it has its own mechanism.
+    module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
+
     if xcodeversion >= 4.0 and target in ('10.6', '10.5', '10.4'):
         environ_append('LDFLAGS',
                        '-Wl,-no_function_starts -Wl,-no_version_load_command')
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 3118785..2b2a38b 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -45,7 +45,8 @@
   <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
              makeinstallargs="install_sw" supports-non-srcdir-builds="no">
-    <branch module="openssl-0.9.8zg.tar.gz" version="0.9.8zg" repo="openssl"/>
+    <branch module="openssl-1.0.2f.tar.gz" version="1.0.2f" repo="openssl"
+            hash="sha256:932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 3174ffb..17f340c 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -4,6 +4,8 @@
 <moduleset>
   <repository name="git.gnome.org" type="git" default="yes"
               href="git://git.gnome.org/"/>
+  <repository name="openssl" type="tarball"
+              href="https://www.openssl.org/source/"/>
   <repository name="lysator" type="git"
               href="https://git.lysator.liu.se/"/>
   <!--repository name="git.gnu.org" type="git" href="git://git.savannah.gnu.org/"/-->
@@ -33,6 +35,15 @@
     </dependencies>
   </metamodule>
 
+  <!-- of the many arguments such as prefix and libdir that jhbuild might pass
+  to configure, openssl only understands prefix, and only with =. -->
+  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
+             makeinstallargs="install_sw" supports-non-srcdir-builds="no">
+    <branch module="openssl-1.0.2f.tar.gz" version="1.0.2f" repo="openssl"
+            hash="sha256:932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c"/>
+  </autotools>
+
   <!-- Rudely demands TeX to build documentation -->
   <!-- Assembler files are missing md5-compress.asm for x86_64 -->
   <autotools id="libnettle"
@@ -43,6 +54,7 @@
             tag="nettle_2.7_release_20130424"/>
     <dependencies>
       <dep package="gmp"/>
+      <dep package="openssl"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 653a2b1..8e64d7e 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -4,6 +4,8 @@
 <moduleset>
   <repository name="git.gnome.org" type="git" default="yes"
               href="git://git.gnome.org/"/>
+  <repository name="openssl" type="tarball"
+              href="https://www.openssl.org/source/"/>
   <repository name="lysator" type="git" href="https://git.lysator.liu.se/"/>
   <!--repository name="git.gnu.org" type="git"
               href="git://git.savannah.gnu.org/"/-->
@@ -33,6 +35,15 @@
     </dependencies>
   </metamodule>
 
+  <!-- of the many arguments such as prefix and libdir that jhbuild might pass
+  to configure, openssl only understands prefix, and only with =. -->
+  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
+             makeinstallargs="install_sw" supports-non-srcdir-builds="no">
+    <branch module="openssl-1.0.2f.tar.gz" version="1.0.2f" repo="openssl"
+            hash="sha256:932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c"/>
+  </autotools>
+
   <!-- Rudely demands TeX to build documentation -->
   <!-- Assembler files are missing md5-compress.asm for x86_64 -->
   <autotools id="libnettle"
@@ -43,6 +54,7 @@
             tag="nettle_2.7_release_20130424"/>
     <dependencies>
       <dep package="gmp"/>
+      <dep package="openssl"/>
     </dependencies>
   </autotools>