Check-in [e95acf08f0]
Overview
SHA1:e95acf08f001a408f7e7a1b4c645313666397f22
Date: 2010-09-26 04:40:48
User: rkeene
Comment:Added zlib package

Added support for specifying --with-zlib to kitsh if zlib built fine

Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2010-09-26
04:40
[c48a3eddef] KitCreator 0.1.0.x (user: rkeene, tags: trunk, 0.1.0)
04:40
[e95acf08f0] Added zlib package

Added support for specifying --with-zlib to kitsh if zlib built fine (user: rkeene, tags: trunk)

04:40
[56c3d5d022] Cleaned up LDFLAGS settings

Fixed issue with "--with-zlib" wiping out LDFLAGS (user: rkeene, tags: trunk)

Changes

Modified kitcreator from [fd35339ae1] to [be98577a11].

21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
fi

CONFIGUREEXTRA="$@"
export CONFIGUREEXTRA

failedpkgs=""
buildfailed="0"
for pkg in tcl tk itcl mk4tcl tclvfs kitsh; do
	if [ "${mode}" = "distclean" ]; then
		rm -rf "${pkg}/src"
	fi

	if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
		rm -f "${pkg}/build.log"
		rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"







|







21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
fi

CONFIGUREEXTRA="$@"
export CONFIGUREEXTRA

failedpkgs=""
buildfailed="0"
for pkg in tcl tk itcl mk4tcl tclvfs zlib kitsh; do
	if [ "${mode}" = "distclean" ]; then
		rm -rf "${pkg}/src"
	fi

	if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
		rm -f "${pkg}/build.log"
		rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"

Modified kitsh/build.sh from [f495d0968a] to [73b3561dba].

29
30
31
32
33
34
35
36







37



38





39
40
41
42
43
44
45

(
	cp -r 'buildsrc' 'build'
	cd "${BUILDDIR}" || exit 1

	# Cleanup, just incase the incoming directory was not pre-cleaned
	${MAKE:-make} distclean >/dev/null 2>/dev/null








	# Compile Kitsh



	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}





	${MAKE:-make} || exit 1

	# Strip the kit of all symbols, if possible
	strip kit >/dev/null 2>/dev/null

	# Create VFS directory
	mkdir "starpack.vfs"








>
>
>
>
>
>
>

>
>
>
|
>
>
>
>
>







29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

(
	cp -r 'buildsrc' 'build'
	cd "${BUILDDIR}" || exit 1

	# Cleanup, just incase the incoming directory was not pre-cleaned
	${MAKE:-make} distclean >/dev/null 2>/dev/null

	# Figure out if zlib compiled
	ZLIBDIR=$(cd "${OTHERPKGSDIR}/zlib/inst"; pwd)
	export ZLIBDIR
	if [ ! -f "${ZLIBDIR}/lib/libz.a" ]; then
		unset ZLIBDIR
	fi

	# Compile Kitsh
	if [ -z "${ZLIBDIR}" ]; then
		echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"

		./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
	else
		echo "./configure --with-tcl=\"${TCLCONFIGDIR}\" --with-zlib=\"${ZLIBDIR}\" ${CONFIGUREEXTRA}"

		./configure --with-tcl="${TCLCONFIGDIR}" --with-zlib="${ZLIBDIR}" ${CONFIGUREEXTRA}
	fi
	${MAKE:-make} || exit 1

	# Strip the kit of all symbols, if possible
	strip kit >/dev/null 2>/dev/null

	# Create VFS directory
	mkdir "starpack.vfs"

Added zlib/build.sh version [72ab3f6699].















































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
#! /bin/bash

if [ ! -f 'build.sh' ]; then
	echo 'ERROR: This script must be run from the directory it is in' >&2

	exit 1
fi
if [ -z "${TCLVERS}" ]; then
	echo 'ERROR: The TCLVERS environment variable is not set' >&2

	exit 1
fi

ZLIBVERS="1.2.3"
SRC="src/zlib-${ZLIBVERS}.tar.gz"
SRCURL="http://www.zlib.net/zlib-${ZLIBVERS}.tar.gz"
BUILDDIR="$(pwd)/build/zlib-${ZLIBVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"
export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR

rm -rf 'build' 'out' 'inst'
mkdir 'build' 'out' 'inst' || exit 1

if [ ! -f "${SRC}" ]; then
	mkdir 'src' >/dev/null 2>/dev/null

	rm -f "${SRC}.tmp"
	wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
	mv "${SRC}.tmp" "${SRC}"
fi

(
	cd 'build' || exit 1

	if [ ! -d '../buildsrc' ]; then
		gzip -dc "../${SRC}" | tar -xf -
	else    
		cp -rp ../buildsrc/* './'
	fi

	cd "${BUILDDIR}" || exit 1
	# We don't pass CONFIGUREEXTRA here, since this isn't a GNU autoconf
	# script and will puke
	./configure --prefix="${INSTDIR}"

	${MAKE:-make} || exit 1

	${MAKE:-make} install

	# We don't really care too much about failure in zlib
	exit 0
) || exit 1

exit 0