From a357b016cf246f92fe8d1d82120f85dc92078f7e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 1 Aug 2014 10:16:46 +0200 Subject: [PATCH] Revert part of previous curl change. Olta pointed out that using the package links is indeed the correct way to handle the absolute location of the ca root certificates, and this change was not needed for things to work. --- net-misc/curl/curl-7.37.0.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net-misc/curl/curl-7.37.0.recipe b/net-misc/curl/curl-7.37.0.recipe index eebf56f84..7c89e36ad 100644 --- a/net-misc/curl/curl-7.37.0.recipe +++ b/net-misc/curl/curl-7.37.0.recipe @@ -4,7 +4,7 @@ COPYRIGHT="1996-2014, Daniel Stenberg, . All rights reserved." LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-$portVersion.tar.bz2" CHECKSUM_SHA256="24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -43,7 +43,8 @@ BUILD_PREREQUIRES=" BUILD() { - certsDir="$dataDir/ssl" + certsInstallDir="$portPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" libtoolize --force --copy --install autoconf