mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
Update curl recipe
* Add cmd:curl_config to provides. * Use runConfigure. * Use jobArgs. * Use $developLibDir in curl-config.
This commit is contained in:
@@ -4,7 +4,7 @@ COPYRIGHT="1996-2012, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
|
||||
LICENSE="Curl"
|
||||
SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2"
|
||||
CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
ARCHITECTURES="x86_gcc2 ?x86"
|
||||
|
||||
# libcurl's SONAME is bumped whenever backward compat is broken, v7.16
|
||||
@@ -12,6 +12,7 @@ ARCHITECTURES="x86_gcc2 ?x86"
|
||||
PROVIDES="
|
||||
curl = $portVersion
|
||||
cmd:curl = $portVersion compat >= 7.16
|
||||
cmd:curl_config = $portVersion compat >= 7.16
|
||||
lib:libcurl = $portVersion compat >= 7.16
|
||||
"
|
||||
REQUIRES="
|
||||
@@ -35,16 +36,15 @@ SOURCE_DIR="$portVersionedName"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
curlPackageLinksDir="$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName"
|
||||
certsInstallDir="$curlPackageLinksDir/ca_root_certificates"
|
||||
certsInstallDir="$portPackageLinksDir/ca_root_certificates"
|
||||
certsDir="$certsInstallDir/$relativeDataRootDir/ssl"
|
||||
|
||||
libtoolize --force --copy --install
|
||||
autoconf
|
||||
./configure $configureDirArgs \
|
||||
runConfigure ./configure \
|
||||
--enable-ipv6 \
|
||||
--with-ca-bundle="$certsDir/CARootCertificates.pem"
|
||||
make
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
@@ -54,7 +54,12 @@ INSTALL()
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLibs libcurl
|
||||
fixPkgconfig
|
||||
|
||||
|
||||
# fix curl-config
|
||||
fixDevelopLibDirReferences $binDir/curl-config
|
||||
sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \
|
||||
-e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config
|
||||
|
||||
# install html documentation for curl
|
||||
mkdir -p "$docDir"
|
||||
install -c -m 644 "docs/curl.html" "$docDir"
|
||||
|
||||
Reference in New Issue
Block a user