gnutls36: Re-enable and rename to "gnutls".

This commit is contained in:
waddlesplash
2018-08-27 00:33:02 -04:00
committed by GitHub
parent d004c24a6b
commit ad7a8e0b68

View File

@@ -16,8 +16,8 @@ CHECKSUM_SHA256="ed642b66a4ecf4851ab2d809cd1475c297b6201d8e8bd14b4d1c08b53ffca99
SOURCE_DIR="gnutls-$portVersion"
PATCHES="gnutls-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="x86"
libgnutls_opensslVersion="27.0.2"
libgnutlsVersion="30.21.0"
@@ -28,7 +28,7 @@ libgnutlsVersionCompat="$libgnutlsVersion compat >= ${libgnutlsVersion%%.*}"
libgnutlsxxVersionCompat="$libgnutlsxxVersion compat >= ${libgnutlsxxVersion%%.*}"
PROVIDES="
gnutls36$secondaryArchSuffix = $portVersion
gnutls$secondaryArchSuffix = $portVersion
lib:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
lib:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
lib:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
@@ -49,10 +49,11 @@ REQUIRES="
CONFLICTS="
gnutls34$secondaryArchSuffix
gnutls35$secondaryArchSuffix
gnutls36$secondaryArchSuffix
"
PROVIDES_bin="
gnutls36${secondaryArchSuffix}_bin = $portVersion
gnutls${secondaryArchSuffix}_bin = $portVersion
cmd:certtool$secondaryArchSuffix
cmd:gnutls_cli$secondaryArchSuffix
cmd:gnutls_cli_debug$secondaryArchSuffix
@@ -62,7 +63,7 @@ PROVIDES_bin="
cmd:srptool$secondaryArchSuffix
"
REQUIRES_bin="
gnutls36$secondaryArchSuffix == $portVersion base
gnutls$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
lib:libgcrypt$secondaryArchSuffix
lib:libgpg_error$secondaryArchSuffix
@@ -82,13 +83,13 @@ CONFLICTS_bin="
"
PROVIDES_devel="
gnutls36${secondaryArchSuffix}_devel = $portVersion
gnutls${secondaryArchSuffix}_devel = $portVersion
devel:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
devel:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
devel:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
"
REQUIRES_devel="
gnutls36$secondaryArchSuffix == $portVersion base
gnutls$secondaryArchSuffix == $portVersion base
devel:libgcrypt$secondaryArchSuffix
devel:libgpg_error$secondaryArchSuffix
devel:libnettle$secondaryArchSuffix
@@ -134,7 +135,7 @@ TEST_REQUIRES="
cmd:git
"
defineDebugInfoPackage gnutls36$secondaryArchSuffix \
defineDebugInfoPackage gnutls$secondaryArchSuffix \
$libDir/libgnutls-openssl.so.$libgnutls_opensslVersion \
$libDir/libgnutls.so.$libgnutlsVersion \
$libDir/libgnutlsxx.so.$libgnutlsxxVersion