From 015e48df6e2f15275161012fbb2544ce0a84c752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 10 Feb 2015 17:00:42 +0100 Subject: [PATCH 1/2] Fix soname mistake --- library/Makefile | 2 +- scripts/bump_version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Makefile b/library/Makefile index 37ba14e61..d2724252b 100644 --- a/library/Makefile +++ b/library/Makefile @@ -22,7 +22,7 @@ ifdef SHARED CFLAGS += -fPIC endif -SONAME=libmbedtls.so.7 +SONAME=libmbedtls.so.8 DLEXT=so.8 # OSX shared library extension: diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index ae744516a..2262c9c5c 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -56,7 +56,7 @@ then mv tmp library/CMakeLists.txt [ $VERBOSE ] && echo "Bumping SOVERSION in library/Makefile" - sed -e "s/SONAME=libpolarssl.so.[0-9]\+/SONAME=libpolarssl.so.$SOVERSION/g" -e "s/DLEXT=so.[0-9]\+/DLEXT=so.$SOVERSION/g" < library/Makefile > tmp + sed -e "s/SONAME=libmbedtls.so.[0-9]\+/SONAME=libmbedtls.so.$SOVERSION/g" -e "s/DLEXT=so.[0-9]\+/DLEXT=so.$SOVERSION/g" < library/Makefile > tmp mv tmp library/Makefile fi From 4ed5df8a06d6d863cf9d54a13a687cb196d7d2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 16 Feb 2015 15:52:48 +0000 Subject: [PATCH 2/2] Remove gnutls from the travis build Causing spurious fails of ssl-opt.sh. Likely a version issue. It would be better to investigate the exact problem, and maybe adapt ssl-opt.sh to be check for a minimum version just as compat.sh does, but this is a quick fix. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f100c3be..0a51e7eed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ compiler: - clang - gcc before_install: sudo apt-get update -install: sudo apt-get install gnutls-bin valgrind perl +install: sudo apt-get install valgrind perl script: - cmake -D CMAKE_BUILD_TYPE:String="Check" . - make