From feb28bbbb25d2bc6f976dd812319e5b4d561e570 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 22 Sep 2018 19:29:59 +0000 Subject: [PATCH] mbedtls: bump to 2.13.0, BUILD_PREREQUIRES+="cmd:python". Unlike 2.12.0, which did not require python, 2.13.0 does. --- ...ls-2.12.0.recipe => mbedtls-2.13.0.recipe} | 19 ++++++++++++------- ....12.0.patchset => mbedtls-2.13.0.patchset} | 0 2 files changed, 12 insertions(+), 7 deletions(-) rename net-libs/mbedtls/{mbedtls-2.12.0.recipe => mbedtls-2.13.0.recipe} (92%) rename net-libs/mbedtls/patches/{mbedtls-2.12.0.patchset => mbedtls-2.13.0.patchset} (100%) diff --git a/net-libs/mbedtls/mbedtls-2.12.0.recipe b/net-libs/mbedtls/mbedtls-2.13.0.recipe similarity index 92% rename from net-libs/mbedtls/mbedtls-2.12.0.recipe rename to net-libs/mbedtls/mbedtls-2.13.0.recipe index b0dddba5e..4311dbccf 100644 --- a/net-libs/mbedtls/mbedtls-2.12.0.recipe +++ b/net-libs/mbedtls/mbedtls-2.13.0.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2006-2018 ARM Limited" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-$portVersion.tar.gz" -CHECKSUM_SHA256="05b126f25d4438f206d062b48cd2f2db2a1cd11bda58b21afe40b9b7cf6fca48" +CHECKSUM_SHA256="4c7df9ad932d84e484da833ac6c98694a0d3cb820ea8f445f74f44d519265f84" SOURCE_DIR="mbedtls-mbedtls-$portVersion" PATCHES="mbedtls-$portVersion.patchset" @@ -15,7 +15,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" libcryptoVersion="3" -libtlsVersion="11" +libtlsVersion="12" libx509Version="0" PROVIDES=" @@ -98,14 +98,15 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:perl + cmd:python cmd:sed " PATCH() { sed -i \ - -e "s|/include/mbedtls|/$relativeOldIncludeDir|;" \ - -e "s|/include|/$relativeOldIncludeDir|;" \ + -e "s|/include/mbedtls|/$relativeIncludeDir|;" \ + -e "s|/include|/$relativeIncludeDir|;" \ -e "s|/bin/|/$relativeBinDir/|;" \ -e "s|/bin\$|/$relativeBinDir|;" \ -e "s|/lib\$|/$relativeLibDir|;" \ @@ -120,11 +121,15 @@ BUILD() INSTALL() { - make install SHARED=yes DESTDIR=$prefix + make install SHARED=yes DESTDIR="$prefix" + prepareInstalledDevelLibs libmbedcrypto libmbedtls libmbedx509 - packageEntries devel $developDir + + packageEntries devel \ + "$developDir" + if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir + rm -rf "$binDir" fi } diff --git a/net-libs/mbedtls/patches/mbedtls-2.12.0.patchset b/net-libs/mbedtls/patches/mbedtls-2.13.0.patchset similarity index 100% rename from net-libs/mbedtls/patches/mbedtls-2.12.0.patchset rename to net-libs/mbedtls/patches/mbedtls-2.13.0.patchset