remove openssl_devel and change to use openssl instead since they conflict.

parent eb1c7219
...@@ -6,7 +6,7 @@ class Cmake < Package ...@@ -6,7 +6,7 @@ class Cmake < Package
source_sha1 'a37785b3f256a31ee21a047569bc74a8f57067bb' source_sha1 'a37785b3f256a31ee21a047569bc74a8f57067bb'
depends_on 'buildessential' depends_on 'buildessential'
depends_on 'openssl_devel' depends_on 'openssl'
def self.build def self.build
system "./bootstrap" system "./bootstrap"
......
...@@ -4,7 +4,7 @@ class Libevent < Package # name the ...@@ -4,7 +4,7 @@ class Libevent < Package # name the
version '2.0.22' # software version version '2.0.22' # software version
source_url 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' # software source tarball url source_url 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' # software source tarball url
source_sha1 'a586882bc93a208318c70fc7077ed8fca9862864' # source tarball sha1 sum source_sha1 'a586882bc93a208318c70fc7077ed8fca9862864' # source tarball sha1 sum
depends_on 'openssl_devel' depends_on 'openssl'
def self.build # self.build contains commands needed to build the software from source def self.build # self.build contains commands needed to build the software from source
system "./configure" system "./configure"
......
...@@ -6,7 +6,7 @@ class Libunwind < Package ...@@ -6,7 +6,7 @@ class Libunwind < Package
source_sha1 '7c93a6ae35afff4d0efd143b62a9fd235423964f' source_sha1 '7c93a6ae35afff4d0efd143b62a9fd235423964f'
depends_on 'buildessential' depends_on 'buildessential'
depends_on 'openssl_devel' depends_on 'openssl'
def self.build def self.build
system "CC='gcc' ./configure" system "CC='gcc' ./configure"
......
require 'package'
#Installs JUST the headers to match the chromeos supplied libraries so that you can build things
# that link with openssl. Needs to be kept version-synced with chromeos releases
# Could detect current version and grab one of many different packages, compare to saved
# hashes and support multiple versions if needed
#grumble - package names in crew must conform to ruby variable name restrictions. For instance '-' is disallowed
class Openssl_devel < Package
version '1.0.2f'
# chromeos wget can't do proper ssl negotiation with this server
# source_url 'https://www.openssl.org/source/old/1.0.2/openssl-1.0.2g.tar.gz'
# so use their ftp server.
source_url 'ftp://ftp.openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz'
source_sha1 '2047c592a6e5a42bd37970bdb4a931428110a927'
depends_on 'perl'
def self.build
# only need to run config to get the headers set up right
system './config'
end
def self.install
out = "#{CREW_DEST_DIR}/usr/local/include/openssl"
system "mkdir -p #{out}"
`ls ./include/openssl`.split(' ').each do |header|
system "cp", "./include/openssl/#{header}", out
end
#system "cp", "./include/openssl/*", "#{out}"
end
end
...@@ -7,7 +7,7 @@ class Python27 < Package ...@@ -7,7 +7,7 @@ class Python27 < Package
depends_on 'bz2' depends_on 'bz2'
depends_on 'ncurses' depends_on 'ncurses'
depends_on 'openssl_devel' depends_on 'openssl'
def self.build # self.build contains commands needed to build the software from source def self.build # self.build contains commands needed to build the software from source
system "./configure --prefix=/usr/local CPPFLAGS=\"-I/usr/local/include -I/usr/local/include/ncurses\" LDFLAGS=\"-L/usr/local/lib\" CFLAGS=\" -fPIC\"" system "./configure --prefix=/usr/local CPPFLAGS=\"-I/usr/local/include -I/usr/local/include/ncurses\" LDFLAGS=\"-L/usr/local/lib\" CFLAGS=\" -fPIC\""
......
...@@ -5,7 +5,7 @@ class Python34 < Package ...@@ -5,7 +5,7 @@ class Python34 < Package
source_url 'https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz' # software source tarball url source_url 'https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz' # software source tarball url
source_sha1 'e8c1bd575a6ccc2a75f79d9d094a6a29d3802f5d' # source tarball sha1 sum source_sha1 'e8c1bd575a6ccc2a75f79d9d094a6a29d3802f5d' # source tarball sha1 sum
depends_on 'openssl_devel' depends_on 'openssl'
def self.build # self.build contains commands needed to build the software from source def self.build # self.build contains commands needed to build the software from source
system "./configure" system "./configure"
......
...@@ -8,7 +8,7 @@ class Tmux < Package # name the pack ...@@ -8,7 +8,7 @@ class Tmux < Package # name the pack
depends_on 'readline' # software dependencies depends_on 'readline' # software dependencies
depends_on 'libevent' depends_on 'libevent'
# does this really depend on openssl? or just on libevent that depends on openssl # does this really depend on openssl? or just on libevent that depends on openssl
depends_on 'openssl_devel' depends_on 'openssl'
depends_on 'ncurses' depends_on 'ncurses'
def self.build # self.build contains commands needed to build the software from source def self.build # self.build contains commands needed to build the software from source
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment