generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build fixes and simplifications

Browse Source 
switch from submodules to plain-old-clones
 remove broken biotest for now

ok beck@
This commit is contained in:
Brent Cook 2014-07-10 19:41:42 -05:00
parent 2ce79c599b
commit faaf265e84
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
update.sh
View File

@ -3,15 +3,15 @@ set -e
# resync this library with the upstream project, remove old submodule dirs # resync this library with the upstream project, remove old submodule dirs
if [ -d openbsd ]; then if [ -d openbsd ]; then
git submodule init (cd openbsd
git submodule update git co master
git pull)
else else
if [ -z "$LIBRESSL_GIT" ]; then if [ -z "$LIBRESSL_GIT" ]; then
git submodule add https://github.com/libressl-portable/openbsd.git git clone https://github.com/libressl-portable/openbsd.git
else else
git submodule add $LIBRESSL_GIT/openbsd git clone $LIBRESSL_GIT/openbsd
git submodule update fi
fi
fi fi
libssl_src=openbsd/src/lib/libssl libssl_src=openbsd/src/lib/libssl
@ -292,7 +292,7 @@ for i in ssl/ssltest.c ssl/testssl certs/ca.pem certs/server.pem; do
done done
# do not directly run all test programs # do not directly run all test programs
test_excludes=(aeadtest evptest pq_test ssltest arc4randomforktest) test_excludes=(biotest aeadtest evptest pq_test ssltest arc4randomforktest)
(cd tests (cd tests
cp Makefile.am.tpl Makefile.am cp Makefile.am.tpl Makefile.am
@ -313,8 +313,10 @@ cp $libcrypto_regress/aead/aeadtests.txt tests
cp $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt cp $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt
chmod 755 tests/testssl chmod 755 tests/testssl
for i in "${test_excludes[@]}"; do for i in "${test_excludes[@]}"; do
echo "TESTS += ${i}.sh" >> tests/Makefile.am if [ -e tests/${i}.sh ]; then
echo "EXTRA_DIST += ${i}.sh" >> tests/Makefile.am echo "TESTS += ${i}.sh" >> tests/Makefile.am
echo "EXTRA_DIST += ${i}.sh" >> tests/Makefile.am
fi
done done
echo "EXTRA_DIST += aeadtests.txt" >> tests/Makefile.am echo "EXTRA_DIST += aeadtests.txt" >> tests/Makefile.am
echo "EXTRA_DIST += evptests.txt" >> tests/Makefile.am echo "EXTRA_DIST += evptests.txt" >> tests/Makefile.am
@ -328,19 +330,6 @@ echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
done done
) )
#XXX fix this in a header and remove it.
# remove unsupported __bounded__ attributes
#bounded_excludes=(
# include/openssl/bio.h
# include/openssl/buffer.h
# include/openssl/md5.h
# include/openssl/sha.h
# crypto/chacha/chacha-merged.c
# )
#for i in "${bounded_excludes[@]}"; do
# sed -ie 's/__attribute__.*((__bounded__.*/;/' $i
#done
(cd ssl (cd ssl
sed -e "s/libssl-version/${libssl_version}/" Makefile.am.tpl > Makefile.am sed -e "s/libssl-version/${libssl_version}/" Makefile.am.tpl > Makefile.am
for i in `ls -1 *.c|sort`; do for i in `ls -1 *.c|sort`; do