From 341317a168ba7b080ae4efe0958edd85cfd380eb Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 21 Sep 2016 23:44:15 -0400 Subject: [PATCH] updated bits for cygwin, but not working with the openssl yet. --- doc/cygwin_install_list.txt | 7 +++++-- scripts/clam/cpp/variables.def | 2 +- scripts/core/variables.sh | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/cygwin_install_list.txt b/doc/cygwin_install_list.txt index cd9f317d..acd8d777 100644 --- a/doc/cygwin_install_list.txt +++ b/doc/cygwin_install_list.txt @@ -11,8 +11,9 @@ using apt-cyg (https://github.com/transcode-open/apt-cyg), this is the only command needed: apt-cyg install bc crypt emacs email expect gcc-g++ git gitk gvim inetutils \ - libcurl-devel libgnutls-devel make mutt ncftp openssh perl python \ - subversion time unzip util-linux vim xinit xterm zip + libcrypt-devel libcurl-devel libgnutls-devel make mutt ncftp openssh \ + openssl-devel perl python subversion time unzip util-linux vim xinit \ + xterm zip =========== @@ -51,6 +52,8 @@ general tools: libraries: libcurl-devel + libgnutls-devel + openssl-devel build tools: gcc4 diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def index a84161fc..03f2ab65 100644 --- a/scripts/clam/cpp/variables.def +++ b/scripts/clam/cpp/variables.def @@ -438,7 +438,7 @@ export COMPILER_HEADER_DIR # These flags may be useful across multiple compilers. # -# SSL brings in the openSSL libraries. +# SSL brings in the OpenSSL libraries. USE_SSL= # CURL provides access to the curl library. diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index da6d3511..b71defbe 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -79,6 +79,11 @@ if [ -z "$NECHUNG" ]; then # IS_MSYS will be non-empty if this is the msys toolset. otherwise # we assume that it's cygwin. IS_MSYS=$(uname | grep -i ming) + + # if not MSYS, then we'll assume cygwin and set the cygwin root var. + if [ -z "$IS_MSYS" ]; then + define_yeti_variable CYGROOT=$(cygpath -w -m /) + fi fi ############## -- 2.34.1