libgcrypt: bump to 1.8.3, tweak configure, enable x86_gcc2.

* Unlike 1.8.2, which passed all tests, 1.8.3 was failing one
  test, "version", with the following error message:

  Fatal: failed to acquire the Jent RNG lock: Resource deadlock

* Pass "--disable-jent-support" to configure, in order to avoid
  the test failure described above.
* Drop the call to autoreconf, as it is not needed.
* Sort PROVIDES_devel.
This commit is contained in:
fbrosson
2018-07-13 01:29:34 +00:00
parent ae9ba68c72
commit 65bd33e39f
2 changed files with 15 additions and 13 deletions

View File

@@ -2,17 +2,17 @@ SUMMARY="GNU's basic cryptographic library"
DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
used in GnuPG."
HOMEPAGE="https://gnupg.org/related_software/libgcrypt/"
COPYRIGHT="2000-2017 Free Software Foundation, Inc."
COPYRIGHT="2000-2018 Free Software Foundation, Inc."
LICENSE="GNU LGPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
CHECKSUM_SHA256="c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07"
CHECKSUM_SHA256="66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c"
PATCHES="libgcrypt-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion=20.2.2
libVersion=20.2.3
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -27,10 +27,10 @@ REQUIRES="
PROVIDES_devel="
libgcrypt${secondaryArchSuffix}_devel = $portVersion
devel:libgcrypt$secondaryArchSuffix = $libVersion
cmd:dumpsexp$secondaryArchSuffix
cmd:libgcrypt_config$secondaryArchSuffix
cmd:hmac256$secondaryArchSuffix
cmd:mpicalc$secondaryArchSuffix
cmd:dumpsexp$secondaryArchSuffix = $portVersion
cmd:hmac256$secondaryArchSuffix = $portVersion
cmd:libgcrypt_config$secondaryArchSuffix = $portVersion
cmd:mpicalc$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libgcrypt$secondaryArchSuffix == $portVersion base
@@ -56,8 +56,9 @@ defineDebugInfoPackage libgcrypt$secondaryArchSuffix \
BUILD()
{
autoreconf -vfi
runConfigure ./configure
runConfigure ./configure \
--disable-jent-support \
make $jobArgs
}
@@ -89,5 +90,6 @@ INSTALL()
TEST()
{
LIBRARY_PATH="$sourceDir/src/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \
make check
}

View File

@@ -5,7 +5,7 @@ Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 672396c..1915737 100644
index dfcd4ef..132fa7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,6 +761,7 @@ fi