Check-in [6548a534b1]
Overview
Comment:Fixed to support calling AR with options
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6548a534b177bb5cf1edfabb7a809fdd40d24797
User & Date: rkeene on 2010-09-26 04:41:16
Other Links: manifest | tags
Context
2010-09-26
04:41
Added Tk/xlib to include search path check-in: b5c571778a user: rkeene tags: trunk
04:41
Fixed to support calling AR with options check-in: 6548a534b1 user: rkeene tags: trunk
04:41
Updated licensing information check-in: 37152044b7 user: rkeene tags: trunk
Changes

Modified zlib/build.sh from [72ab3f6699] to [d2bfb61304].

36
37
38
39
40
41
42




43
44
45
46
47
48
49
50
51
52
53
54
55
	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







>
>
>
>




|

|






36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
	if [ ! -d '../buildsrc' ]; then
		gzip -dc "../${SRC}" | tar -xf -
	else    
		cp -rp ../buildsrc/* './'
	fi

	cd "${BUILDDIR}" || exit 1
	# ZLIB Expects AR to contain options
	AR="${AR:-ar} rcu"
	export AR

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

	${MAKE:-make} AR="${AR}" || exit 1

	${MAKE:-make} install AR="${AR}"

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

exit 0