Check-in [1a5bbc4282]
Overview
Comment:Work towards upgrading zlib -- untested on most platforms
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:1a5bbc4282c843aa5607ea69a53a5565ac89b056
User & Date: rkeene on 2014-04-27 04:13:42
Other Links: manifest | tags
Context
2014-04-28
20:36
Fixes for zlib on other platforms check-in: b62450459c user: rkeene tags: trunk
2014-04-27
04:17
Started work on adding TclTCC package check-in: 2a6f69ee57 user: rkeene tags: tcc
04:13
Work towards upgrading zlib -- untested on most platforms check-in: 1a5bbc4282 user: rkeene tags: trunk
04:12
Minor whitespace change check-in: a12c65d1e5 user: rkeene tags: trunk
Changes

Modified zlib/build.sh from [2953ae8c82] to [07595632d1].

     7      7   fi
     8      8   if [ -z "${TCLVERS}" ]; then
     9      9   	echo 'ERROR: The TCLVERS environment variable is not set' >&2
    10     10   
    11     11   	exit 1
    12     12   fi
    13     13   
    14         -ZLIBVERS="1.2.3"
           14  +ZLIBVERS="1.2.8"
    15     15   SRC="src/zlib-${ZLIBVERS}.tar.gz"
    16     16   SRCURL="http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERS}/zlib-${ZLIBVERS}.tar.gz/download"
    17     17   BUILDDIR="$(pwd)/build/zlib-${ZLIBVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    21     21   
................................................................................
    45     45   	if [ ! -d '../buildsrc' ]; then
    46     46   		gzip -dc "../${SRC}" | tar -xf -
    47     47   	else    
    48     48   		cp -rp ../buildsrc/* './'
    49     49   	fi
    50     50   
    51     51   	cd "${BUILDDIR}" || exit 1
    52         -	# ZLIB Expects AR to contain options
    53         -	AR="${AR:-ar} rcu"
    54         -	export AR
    55     52   
    56     53   	# If we are building for KitDLL, compile with '-fPIC'
    57     54   	if [ "${KITTARGET}" = "kitdll" ]; then
    58     55   		CFLAGS="${CFLAGS} -fPIC"
    59     56   		export CFLAGS
    60     57   	fi
    61     58   
    62     59   	# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
    63     60   	# script and will puke
    64     61   	echo "Running: ./configure --prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\""
    65     62   	./configure --prefix="${INSTDIR}" --libdir="${INSTDIR}/lib"
    66     63   
    67         -	echo "Running: ${MAKE:-make} AR=\"${AR}\""
    68         -	${MAKE:-make} AR="${AR}" || exit 1
           64  +	echo "Running: ${MAKE:-make}"
           65  +	${MAKE:-make} || exit 1
    69     66   
    70         -	echo "Running: ${MAKE:-make} install AR=\"${AR}\""
    71         -	${MAKE:-make} install AR="${AR}"
           67  +	echo "Running: ${MAKE:-make} install"
           68  +	${MAKE:-make} install
    72     69   
    73     70   	# We don't really care too much about failure in zlib
    74     71   	exit 0
    75     72   ) || exit 1
    76     73   
    77     74   exit 0