You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/07/30 22:20:53 UTC

git commit: vagrant: fix remaining packages for centos5

Updated Branches:
  refs/heads/master 7c1c7fdb2 -> f92d413fe


vagrant: fix remaining packages for centos5


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f92d413f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f92d413f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f92d413f

Branch: refs/heads/master
Commit: f92d413fe15b094e28dc459a089e94dcbe3095a5
Parents: 7c1c7fd
Author: James Peach <jp...@apache.org>
Authored: Tue Jul 30 13:20:41 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jul 30 13:20:46 2013 -0700

----------------------------------------------------------------------
 contrib/manifests/redhat.pp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f92d413f/contrib/manifests/redhat.pp
----------------------------------------------------------------------
diff --git a/contrib/manifests/redhat.pp b/contrib/manifests/redhat.pp
index 4187823..42d7188 100644
--- a/contrib/manifests/redhat.pp
+++ b/contrib/manifests/redhat.pp
@@ -30,13 +30,23 @@ package {'epel-release':
 package {[
     'gcc', 'gcc-c++', 'automake', 'autoconf', 'libtool', 'pkgconfig',
     'openssl-devel', 'tcl-devel', 'expat-devel', 'pcre-devel',
-    'ncurses-devel', 'libcurl-devel', 'libaio-devel',
+    'ncurses-devel', 'libaio-devel',
     'hwloc-devel', 'libcap-devel', 'bison', 'flex', 'make',
-    'perl-ExtUtils-MakeMaker',
   ]:
   ensure => latest
 }
 
+package { $lsbmajdistrelease ? { '5' => 'curl-devel', default => 'libcurl-devel'}:
+  ensure => latest
+}
+
+# RHEL/CentOS 5 doesn't have MakeMaker and I don't know what package to use instead :(
+if $lsbmajdistrelease != '5' {
+  package{'perl-ExtUtils-MakeMaker':
+    ensure => latest
+  }
+}
+
 # development extras.
 package {[
     'gdb', 'valgrind', 'git', 'curl', 'screen', 'ccache'