Check-in [e01d8774a3]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixed issues with compiling LibreSSL
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e01d8774a39d2657b733385185bcf2a124479f7d
User & Date: rkeene 2015-01-20 17:30:52
Context
2015-01-20
18:40
Build-CC 0.9 check-in: 0517669aba user: rkeene tags: trunk, 0.9
17:30
Fixed issues with compiling LibreSSL check-in: e01d8774a3 user: rkeene tags: trunk
17:02
Updated to resolve arch name for unknown platforms check-in: bd4cfb91af user: rkeene tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Added patches/libressl/libressl-2.1.2-androidfixes.diff.























>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
diff -uNr libressl-2.1.2.orig/crypto/compat/reallocarray.c libressl-2.1.2-androidfixes/crypto/compat/reallocarray.c
--- libressl-2.1.2.orig/crypto/compat/reallocarray.c	2014-12-07 22:08:47.000000000 -0600
+++ libressl-2.1.2-androidfixes/crypto/compat/reallocarray.c	2015-01-20 11:10:53.234013000 -0600
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <stdint.h>
+#include <limits.h>
 #include <stdlib.h>
 
 /*

Changes to scripts/post/20-libressl.

39
40
41
42
43
44
45










46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
# Download source
. 'scripts/common'

if [ ! -d "${LIBRESSL_DIR}" ]; then
        download "${LIBRESSL_URL}" "${LIBRESSL_TARBALL}" "${LIBRESSL_SHA1}" || exit 1

        gzip -dc "${LIBRESSL_TARBALL}" | tar -xf -










fi

CC_SAVE="${CC}"
for arch in $(multilib); do
	CC="${CC_SAVE} $(multilib --cflags "${arch}")"
	arch_host="$(multilib --host "${arch}")"
	arch_libdir="$(multilib --libdir "${arch}")"
	libressl_libdir="$(echo "${arch_libdir}" | sed "s|${PREFIX}/*||")"

	# Do not compile if we already have built it
	if [ -e "${arch_libdir}/libssl.a" -o -e "${arch_libdir}/libssl.so" ]; then
		continue
	fi

	# Inform the user of what we are doing
	echo " * Building LibreSSL (version ${LIBRESSL_VERS}) for ${arch_host}"

	rm -rf "libressl-${CCNAME}-${arch_host}"
	cp -rp "${LIBRESSL_DIR}" "libressl-${CCNAME}-${arch_host}"
	cd "libressl-${CCNAME}-${arch_host}" || exit 1

	./configure --prefix="${PREFIX}" --libdir="${libressl_libdir}"  --disable-asm --enable-libtls || exit 1

	${MAKE} ${BUILD_CC_MAKE_FLAGS} || exit 1

	${MAKE} ${BUILD_CC_MAKE_FLAGS} install || exit 1

	cd ..








>
>
>
>
>
>
>
>
>
>







<













|







39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62

63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
# Download source
. 'scripts/common'

if [ ! -d "${LIBRESSL_DIR}" ]; then
        download "${LIBRESSL_URL}" "${LIBRESSL_TARBALL}" "${LIBRESSL_SHA1}" || exit 1

        gzip -dc "${LIBRESSL_TARBALL}" | tar -xf -

	for patch in patches/libressl/*.diff; do
		echo " ** Applying patch to LibreSSL (version ${LIBRESSL_VERS})"

		cat "${patch}" | (
			cd "${LIBRESSL_DIR}" || exit 1

			patch -p1
		) || rm -rf "${LIBRESSL_DIR}"
	done
fi

CC_SAVE="${CC}"
for arch in $(multilib); do
	CC="${CC_SAVE} $(multilib --cflags "${arch}")"
	arch_host="$(multilib --host "${arch}")"
	arch_libdir="$(multilib --libdir "${arch}")"


	# Do not compile if we already have built it
	if [ -e "${arch_libdir}/libssl.a" -o -e "${arch_libdir}/libssl.so" ]; then
		continue
	fi

	# Inform the user of what we are doing
	echo " * Building LibreSSL (version ${LIBRESSL_VERS}) for ${arch_host}"

	rm -rf "libressl-${CCNAME}-${arch_host}"
	cp -rp "${LIBRESSL_DIR}" "libressl-${CCNAME}-${arch_host}"
	cd "libressl-${CCNAME}-${arch_host}" || exit 1

	./configure --host="${CCNAME}" --prefix="${PREFIX}" --libdir="${arch_libdir}"  --disable-asm --enable-libtls || exit 1

	${MAKE} ${BUILD_CC_MAKE_FLAGS} || exit 1

	${MAKE} ${BUILD_CC_MAKE_FLAGS} install || exit 1

	cd ..