From 3800ba38fd9e80ff49bea736c3e3a44822defbf2 Mon Sep 17 00:00:00 2001 From: eschnett Date: Tue, 12 Jun 2012 18:28:38 +0000 Subject: Rename configuration script git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@33 091d3ff0-52bc-4db5-b7a6-18201e4c0cca --- OpenSSL.sh | 183 ------------------------------------------------------ configuration.ccl | 2 +- configure.sh | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 184 deletions(-) delete mode 100644 OpenSSL.sh create mode 100644 configure.sh diff --git a/OpenSSL.sh b/OpenSSL.sh deleted file mode 100644 index 7b8506e..0000000 --- a/OpenSSL.sh +++ /dev/null @@ -1,183 +0,0 @@ -#! /bin/bash - -################################################################################ -# Prepare -################################################################################ - -# Set up shell -if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then - set -x # Output commands -fi -set -e # Abort on errors - - - -################################################################################ -# Search -################################################################################ -if [ -z "${OPENSSL_DIR}" ]; then - echo "BEGIN MESSAGE" - echo "OpenSSL selected, but OPENSSL_DIR not set. Checking some places..." - echo "END MESSAGE" - - DIRS="/usr /usr/local /opt/local /usr/local/packages usr/local/apps /opt/local ${HOME} c:/packages/" - # look into each directory - for dir in $DIRS; do - # libraries might have different file extensions - for libext in a so dylib; do - # libraries can be in /lib or /lib64 - for libdir in lib64 lib; do - FILES="include/openssl/ssl.h $libdir/libssl.${libext} $libdir/libcrypto.${libext}" - # assume this is the one and check all needed files - OPENSSL_DIR="$dir" - for file in $FILES; do - # discard this directory if one file was not found - if [ ! -r "$dir/$file" ]; then - unset OPENSSL_DIR - break - fi - done - # don't look further if all files have been found - if [ -n "$OPENSSL_DIR" ]; then - break - fi - done - # don't look further if all files have been found - if [ -n "$OPENSSL_DIR" ]; then - break - fi - done - # don't look further if all files have been found - if [ -n "$OPENSSL_DIR" ]; then - break - fi - done - - if [ -z "$OPENSSL_DIR" ]; then - echo "BEGIN MESSAGE" - echo "OpenSSL not found" - echo "END MESSAGE" - else - echo "BEGIN MESSAGE" - echo "Found OpenSSL in ${OPENSSL_DIR}" - echo "END MESSAGE" - fi -fi - - -################################################################################ -# Build -################################################################################ - -if [ -z "${OPENSSL_DIR}" \ - -o "$(echo "${OPENSSL_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ] -then - echo "BEGIN MESSAGE" - echo "Using bundled OpenSSL..." - echo "END MESSAGE" - - # Set locations - THORN=OpenSSL - NAME=openssl-1.0.0j - SRCDIR=$(dirname $0) - BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - if [ -z "${OPENSSL_INSTALL_DIR}" ]; then - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} - else - echo "BEGIN MESSAGE" - echo "Installing OpenSSL into ${OPENSSL_INSTALL_DIR}" - echo "END MESSAGE" - INSTALL_DIR=${OPENSSL_INSTALL_DIR} - fi - DONE_FILE=${SCRATCH_BUILD}/done/${THORN} - OPENSSL_DIR=${INSTALL_DIR} - - if [ -e ${DONE_FILE} -a ${DONE_FILE} -nt ${SRCDIR}/dist/${NAME}.tar.gz \ - -a ${DONE_FILE} -nt ${SRCDIR}/OpenSSL.sh ] - then - echo "BEGIN MESSAGE" - echo "OpenSSL has already been built; doing nothing" - echo "END MESSAGE" - else - echo "BEGIN MESSAGE" - echo "Building OpenSSL" - echo "END MESSAGE" - - # Build in a subshell - ( - exec >&2 # Redirect stdout to stderr - if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then - set -x # Output commands - fi - set -e # Abort on errors - cd ${SCRATCH_BUILD} - - # Set up environment - unset EXE - unset LIBS - unset MAKEFLAGS # For some reason, openssl does not compile with this - - echo "OpenSSL: Preparing directory structure..." - mkdir build external done 2> /dev/null || true - rm -rf ${BUILD_DIR} ${INSTALL_DIR} - mkdir ${BUILD_DIR} ${INSTALL_DIR} - - echo "OpenSSL: Unpacking archive..." - pushd ${BUILD_DIR} - ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz - ${PATCH} -p0 < ${SRCDIR}/dist/darwin.patch - - echo "OpenSSL: Configuring..." - cd ${NAME} - ./config --prefix=${OPENSSL_DIR} - - echo "OpenSSL: Building..." - ${MAKE} - - echo "OpenSSL: Installing..." - ${MAKE} install - popd - - echo "OpenSSL: Cleaning up..." - rm -rf ${BUILD_DIR} - - date > ${DONE_FILE} - echo "OpenSSL: Done." - - ) - - if (( $? )); then - echo 'BEGIN ERROR' - echo 'Error while building OpenSSL. Aborting.' - echo 'END ERROR' - exit 1 - fi - fi - -fi - - - -################################################################################ -# Configure Cactus -################################################################################ - -# Set options -if [ "${OPENSSL_DIR}" != '/usr' -a "${OPENSSL_DIR}" != '/usr/local' ]; then - OPENSSL_INC_DIRS="${OPENSSL_DIR}/include" - OPENSSL_LIB_DIRS="${OPENSSL_DIR}/lib" -fi -OPENSSL_LIBS='ssl crypto' - -# Pass options to Cactus -echo "BEGIN MAKE_DEFINITION" -echo "HAVE_OPENSSL = 1" -echo "OPENSSL_DIR = ${OPENSSL_DIR}" -echo "OPENSSL_INC_DIRS = ${OPENSSL_INC_DIRS}" -echo "OPENSSL_LIB_DIRS = ${OPENSSL_LIB_DIRS}" -echo "OPENSSL_LIBS = ${OPENSSL_LIBS}" -echo "END MAKE_DEFINITION" - -echo 'INCLUDE_DIRECTORY $(OPENSSL_INC_DIRS)' -echo 'LIBRARY_DIRECTORY $(OPENSSL_LIB_DIRS)' -echo 'LIBRARY $(OPENSSL_LIBS)' diff --git a/configuration.ccl b/configuration.ccl index ee6847d..4b8825b 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -2,7 +2,7 @@ PROVIDES OpenSSL { - SCRIPT OpenSSL.sh + SCRIPT configure.sh LANG bash OPTIONS OPENSSL_INSTALL_DIR } diff --git a/configure.sh b/configure.sh new file mode 100644 index 0000000..e55fe85 --- /dev/null +++ b/configure.sh @@ -0,0 +1,183 @@ +#! /bin/bash + +################################################################################ +# Prepare +################################################################################ + +# Set up shell +if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then + set -x # Output commands +fi +set -e # Abort on errors + + + +################################################################################ +# Search +################################################################################ +if [ -z "${OPENSSL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "OpenSSL selected, but OPENSSL_DIR not set. Checking some places..." + echo "END MESSAGE" + + DIRS="/usr /usr/local /opt/local /usr/local/packages usr/local/apps /opt/local ${HOME} c:/packages/" + # look into each directory + for dir in $DIRS; do + # libraries might have different file extensions + for libext in a so dylib; do + # libraries can be in /lib or /lib64 + for libdir in lib64 lib; do + FILES="include/openssl/ssl.h $libdir/libssl.${libext} $libdir/libcrypto.${libext}" + # assume this is the one and check all needed files + OPENSSL_DIR="$dir" + for file in $FILES; do + # discard this directory if one file was not found + if [ ! -r "$dir/$file" ]; then + unset OPENSSL_DIR + break + fi + done + # don't look further if all files have been found + if [ -n "$OPENSSL_DIR" ]; then + break + fi + done + # don't look further if all files have been found + if [ -n "$OPENSSL_DIR" ]; then + break + fi + done + # don't look further if all files have been found + if [ -n "$OPENSSL_DIR" ]; then + break + fi + done + + if [ -z "$OPENSSL_DIR" ]; then + echo "BEGIN MESSAGE" + echo "OpenSSL not found" + echo "END MESSAGE" + else + echo "BEGIN MESSAGE" + echo "Found OpenSSL in ${OPENSSL_DIR}" + echo "END MESSAGE" + fi +fi + + +################################################################################ +# Build +################################################################################ + +if [ -z "${OPENSSL_DIR}" \ + -o "$(echo "${OPENSSL_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ] +then + echo "BEGIN MESSAGE" + echo "Using bundled OpenSSL..." + echo "END MESSAGE" + + # Set locations + THORN=OpenSSL + NAME=openssl-1.0.0j + SRCDIR=$(dirname $0) + BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} + if [ -z "${OPENSSL_INSTALL_DIR}" ]; then + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "Installing OpenSSL into ${OPENSSL_INSTALL_DIR}" + echo "END MESSAGE" + INSTALL_DIR=${OPENSSL_INSTALL_DIR} + fi + DONE_FILE=${SCRATCH_BUILD}/done/${THORN} + OPENSSL_DIR=${INSTALL_DIR} + + if [ -e ${DONE_FILE} -a ${DONE_FILE} -nt ${SRCDIR}/dist/${NAME}.tar.gz \ + -a ${DONE_FILE} -nt ${SRCDIR}/configure.sh ] + then + echo "BEGIN MESSAGE" + echo "OpenSSL has already been built; doing nothing" + echo "END MESSAGE" + else + echo "BEGIN MESSAGE" + echo "Building OpenSSL" + echo "END MESSAGE" + + # Build in a subshell + ( + exec >&2 # Redirect stdout to stderr + if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then + set -x # Output commands + fi + set -e # Abort on errors + cd ${SCRATCH_BUILD} + + # Set up environment + unset EXE + unset LIBS + unset MAKEFLAGS # For some reason, openssl does not compile with this + + echo "OpenSSL: Preparing directory structure..." + mkdir build external done 2> /dev/null || true + rm -rf ${BUILD_DIR} ${INSTALL_DIR} + mkdir ${BUILD_DIR} ${INSTALL_DIR} + + echo "OpenSSL: Unpacking archive..." + pushd ${BUILD_DIR} + ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz + ${PATCH} -p0 < ${SRCDIR}/dist/darwin.patch + + echo "OpenSSL: Configuring..." + cd ${NAME} + ./config --prefix=${OPENSSL_DIR} + + echo "OpenSSL: Building..." + ${MAKE} + + echo "OpenSSL: Installing..." + ${MAKE} install + popd + + echo "OpenSSL: Cleaning up..." + rm -rf ${BUILD_DIR} + + date > ${DONE_FILE} + echo "OpenSSL: Done." + + ) + + if (( $? )); then + echo 'BEGIN ERROR' + echo 'Error while building OpenSSL. Aborting.' + echo 'END ERROR' + exit 1 + fi + fi + +fi + + + +################################################################################ +# Configure Cactus +################################################################################ + +# Set options +if [ "${OPENSSL_DIR}" != '/usr' -a "${OPENSSL_DIR}" != '/usr/local' ]; then + OPENSSL_INC_DIRS="${OPENSSL_DIR}/include" + OPENSSL_LIB_DIRS="${OPENSSL_DIR}/lib" +fi +OPENSSL_LIBS='ssl crypto' + +# Pass options to Cactus +echo "BEGIN MAKE_DEFINITION" +echo "HAVE_OPENSSL = 1" +echo "OPENSSL_DIR = ${OPENSSL_DIR}" +echo "OPENSSL_INC_DIRS = ${OPENSSL_INC_DIRS}" +echo "OPENSSL_LIB_DIRS = ${OPENSSL_LIB_DIRS}" +echo "OPENSSL_LIBS = ${OPENSSL_LIBS}" +echo "END MAKE_DEFINITION" + +echo 'INCLUDE_DIRECTORY $(OPENSSL_INC_DIRS)' +echo 'LIBRARY_DIRECTORY $(OPENSSL_LIB_DIRS)' +echo 'LIBRARY $(OPENSSL_LIBS)' -- cgit v1.2.3