[EFL] Add gnutls to jhbuild.module
authorgyuyoung.kim@webkit.org <gyuyoung.kim@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Apr 2015 00:45:48 +0000 (00:45 +0000)
committergyuyoung.kim@webkit.org <gyuyoung.kim@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Apr 2015 00:45:48 +0000 (00:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143777

Reviewed by Csaba Osztrogon√°c.

EFL port has required at least 3.0.0 version of gnutls since r176712.
However some old linux distributions don't support 3.0.0 version. Besides
other projects sometimes need to use lower version of gnutls.

This patch supports to download gnutls through jhbuild, and use it.

* efl/install-dependencies: Add nettle-dev dependency and remove libgnutls28-dev.
* efl/jhbuild.modules: Download 3.3 version because 3.3 version is stable version.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182874 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/efl/install-dependencies
Tools/efl/jhbuild.modules

index 4666e75..e9aeac1 100644 (file)
@@ -1,3 +1,19 @@
+2015-04-15  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [EFL] Add gnutls to jhbuild.module
+        https://bugs.webkit.org/show_bug.cgi?id=143777
+
+        Reviewed by Csaba Osztrogon√°c.
+
+        EFL port has required at least 3.0.0 version of gnutls since r176712.
+        However some old linux distributions don't support 3.0.0 version. Besides
+        other projects sometimes need to use lower version of gnutls.
+
+        This patch supports to download gnutls through jhbuild, and use it.
+
+        * efl/install-dependencies: Add nettle-dev dependency and remove libgnutls28-dev. 
+        * efl/jhbuild.modules: Download 3.3 version because 3.3 version is stable version.
+
 2015-04-15  Mark Lam  <mark.lam@apple.com>
 
         Remove obsolete VMInspector debugging tool.
index 62da765..0a16641 100755 (executable)
@@ -69,7 +69,6 @@ function installDependenciesWithApt {
         libgeoclue-dev \
         libgif-dev \
         libgl1-mesa-dev \
-        libgnutls28-dev \
         libgpg-error-dev \
         libicu-dev \
         libjpeg-dev \
@@ -97,6 +96,7 @@ function installDependenciesWithApt {
         libxss-dev \
         libxt-dev \
         libxtst-dev \
+        nettle-dev \
         ninja-build \
         ragel \
         ruby \
index 9513bee..8e6fd0a 100644 (file)
@@ -11,6 +11,7 @@
       <dep package="freetype6"/>
       <dep package="harfbuzz"/>
       <dep package="glib"/>
+      <dep package="gnutls"/>
       <dep package="glib-networking"/>
       <dep package="libsoup"/>
       <dep package="elementary"/>
@@ -56,6 +57,8 @@
       href="http://llvm.org/svn/llvm-project/"/>
   <repository type="tarball" name="llvm-tar"
       href="http://llvm.org"/>
+  <repository type="tarball" name="gnutls"
+      href="ftp://ftp.gnutls.org"/>
 
   <autotools id="cairo" autogen-sh="configure"
              makeargs="CFLAGS='-fno-lto' CXXFLAGS='-fno-lto' LDFLAGS='-fno-lto'">
             md5sum="9636f60e99b98fd0fdb5239f905ac008"/>
   </autotools>
 
+  <autotools id="gnutls" autogen-sh="configure">
+    <branch module="/gcrypt/gnutls/v3.3/gnutls-3.3.0.tar.xz" version="3.3"
+            repo="gnutls"
+            hash="sha256:7b87a4319f74cae3a5f204b810000f06b8efa1ed0f57c684b9bc454f444fdf13"
+            md5sum="4aeb8014feb4016c73a60f4e1ac73c9f"/>
+  </autotools>
+
   <autotools id="glib-networking">
     <dependencies>
       <dep package="glib"/>