zlib: use bash_utils

Author: rhaas80

configuration.ccl

@@ -2,7 +2,10 @@
 
 PROVIDES zlib
 {
-  SCRIPT configure.sh
+  SCRIPT src/detect.sh
   LANG bash
-  OPTIONS ZLIB_DIR ZLIB_INSTALL_DIR
+  OPTIONS ZLIB_DIR ZLIB_INSTALL_DIR ZLIB_LIBS ZLIB_INCLUDE_DIRS ZLIB_LIB_DIRS
 }
+
+# Pass configuration options to build script
+REQUIRES zlib

configure.sh

@@ -0,0 +1,64 @@
+#! /bin/bash
+
+################################################################################
+# Build
+################################################################################
+
+# Set up shell
+if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then
+    set -x                      # Output commands
+fi
+set -e                          # Abort on errors
+
+# Set locations
+THORN=ZLIB
+NAME=zlib-1.2.8
+SRCDIR="$(dirname $0)"
+BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
+if [ -z "${ZLIB_INSTALL_DIR}" ]; then
+    INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+else
+    echo "Installing zlib into ${ZLIB_INSTALL_DIR} "
+    INSTALL_DIR=${ZLIB_INSTALL_DIR}
+fi
+DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
+ZLIB_DIR=${INSTALL_DIR}
+
+# Set up environment
+unset LIBS
+if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
+    export OBJECT_MODE=64
+fi
+
+# Disable parallel make. With parallel make, I sometimes
+# encounter a build error "ld: in libz.a, malformed archive
+# TOC entry for _zlibVersion, offset 824872 is beyond end of
+# file 237568 for architecture x86_64"
+unset MAKEFLAGS
+
+echo "zlib: Preparing directory structure..."
+cd ${SCRATCH_BUILD}
+mkdir build external done 2> /dev/null || true
+rm -rf ${BUILD_DIR} ${INSTALL_DIR}
+mkdir ${BUILD_DIR} ${INSTALL_DIR}
+
+echo "zlib: Unpacking archive..."
+pushd ${BUILD_DIR}
+${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz
+
+echo "zlib: Configuring..."
+cd ${NAME}
+./configure --prefix=${ZLIB_DIR} --static
+
+echo "zlib: Building..."
+${MAKE}
+
+echo "zlib: Installing..."
+${MAKE} install prefix=${ZLIB_DIR}
+popd
+
+ echo "zlib: Cleaning up..."
+ rm -rf ${BUILD_DIR}
+
+date > ${DONE_FILE}
+echo "zlib: Done."

src/build.sh

@@ -0,0 +1,88 @@
+#! /bin/bash
+
+################################################################################
+# Prepare
+################################################################################
+
+# Set up shell
+if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then
+    set -x                      # Output commands
+fi
+set -e                          # Abort on errors
+
+. $CCTK_HOME/lib/make/bash_utils.sh
+
+# Take care of requests to build the library in any case
+ZLIB_DIR_INPUT=$ZLIB_DIR
+if [ "$(echo "${ZLIB_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ]; then
+    ZLIB_BUILD=yes
+    ZLIB_DIR=
+else
+    ZLIB_BUILD=
+fi
+
+# Try to find the library if build isn't explicitly requested
+if [ -z "${ZLIB_BUILD}" ]; then
+    find_lib ZLIB zlib 1 1.0 "z" "zlib.h" "$ZLIB_DIR"
+fi
+
+THORN=zlib
+
+################################################################################
+# Build
+################################################################################
+
+if [ -n "${ZLIB_BUILD}" -o -z "${ZLIB_DIR}" ]; then
+    echo "BEGIN MESSAGE"
+    echo "Using bundled zlib..."
+    echo "END MESSAGE"
+
+    check_tools "tar"
+
+    # Set locations
+    BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
+    if [ -z "${ZLIB_INSTALL_DIR}" ]; then
+        INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    else
+        echo "BEGIN MESSAGE"
+        echo "Installing zlib into ${ZLIB_INSTALL_DIR}"
+        echo "END MESSAGE"
+        INSTALL_DIR=${ZLIB_INSTALL_DIR}
+    fi
+    ZLIB_BUILD=1
+    ZLIB_DIR=${INSTALL_DIR}
+    ZLIB_INC_DIRS=${ZLIB_DIR}/include
+    ZLIB_LIB_DIRS=${ZLIB_DIR}/lib
+    ZLIB_LIBS=z
+else
+    ZLIB_BUILD=
+    DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
+    if [ ! -e ${DONE_FILE} ]; then
+        mkdir ${SCRATCH_BUILD}/done 2> /dev/null || true
+        date > ${DONE_FILE}
+    fi
+fi
+
+################################################################################
+# Configure Cactus
+################################################################################
+
+# Pass configuration options to build script
+echo "BEGIN MAKE_DEFINITION"
+echo "ZLIB_BUILD       = ${ZLIB_BUILD}"
+echo "ZLIB_INSTALL_DIR = ${ZLIB_INSTALL_DIR}"
+echo "END MAKE_DEFINITION"
+
+set_make_vars "ZLIB" "$ZLIB_LIBS" "$ZLIB_LIB_DIRS" "$ZLIB_INC_DIRS"
+
+# Pass options to Cactus
+echo "BEGIN MAKE_DEFINITION"
+echo "ZLIB_DIR      = ${ZLIB_DIR}"
+echo "ZLIB_INC_DIRS = ${ZLIB_INC_DIRS}"
+echo "ZLIB_LIB_DIRS = ${ZLIB_LIB_DIRS}"
+echo "ZLIB_LIBS     = ${ZLIB_LIBS}"
+echo "END MAKE_DEFINITION"
+
+echo 'INCLUDE_DIRECTORY $(ZLIB_INC_DIRS)'
+echo 'LIBRARY_DIRECTORY $(ZLIB_LIB_DIRS)'
+echo 'LIBRARY           $(ZLIB_LIBS)'