mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
nettle: bump version.
SONAME change remove static libs. disable gcc2
This commit is contained in:
@@ -10,16 +10,15 @@ LICENSE="GNU GPL v2
|
||||
GNU LGPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://ftp.gnu.org/gnu/nettle/nettle-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad"
|
||||
PATCHES="nettle-$portVersion.patchset"
|
||||
CHECKSUM_SHA256="75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
nettle$secondaryArchSuffix = $portVersion
|
||||
lib:libnettle$secondaryArchSuffix = 6.5 compat >= 6
|
||||
lib:libhogweed$secondaryArchSuffix = 4.5 compat >= 4
|
||||
lib:libnettle$secondaryArchSuffix = 7.0 compat >= 7
|
||||
lib:libhogweed$secondaryArchSuffix = 5.0 compat >= 5
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
@@ -38,8 +37,8 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
nettle${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libnettle$secondaryArchSuffix = 6.5 compat >= 6
|
||||
devel:libhogweed$secondaryArchSuffix = 4.5 compat >= 4
|
||||
devel:libnettle$secondaryArchSuffix = 7.0 compat >= 7
|
||||
devel:libhogweed$secondaryArchSuffix = 5.0 compat >= 5
|
||||
"
|
||||
REQUIRES_devel="
|
||||
nettle$secondaryArchSuffix == $portVersion base
|
||||
@@ -62,6 +61,7 @@ BUILD_PREREQUIRES="
|
||||
BUILD()
|
||||
{
|
||||
runConfigure ./configure
|
||||
make desdata
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -69,6 +69,8 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm -f $libDir/lib*.a
|
||||
|
||||
prepareInstalledDevelLibs libnettle libhogweed
|
||||
|
||||
fixPkgconfig
|
||||
@@ -1,53 +0,0 @@
|
||||
From 98900b811b3f55f834befb3ef9a4436be1a924a7 Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Sat, 1 Oct 2016 07:41:20 +0000
|
||||
Subject: gcc2 patch for testsuite/memeql-test.c
|
||||
|
||||
|
||||
diff --git a/testsuite/memeql-test.c b/testsuite/memeql-test.c
|
||||
index 356671d..c2b999d 100644
|
||||
--- a/testsuite/memeql-test.c
|
||||
+++ b/testsuite/memeql-test.c
|
||||
@@ -32,7 +32,7 @@ test_main(void)
|
||||
struct knuth_lfib_ctx random_ctx;
|
||||
|
||||
knuth_lfib_init (&random_ctx, 11);
|
||||
-
|
||||
+ {
|
||||
size_t size;
|
||||
for (size = 0; size < 50; size++)
|
||||
{
|
||||
@@ -50,4 +50,5 @@ test_main(void)
|
||||
b[i] = orig[i];
|
||||
}
|
||||
}
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
From beb17391b7839eaf2280e728698f73335b7974b5 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 21 Mar 2019 20:44:15 +0100
|
||||
Subject: gcc2 patch
|
||||
|
||||
|
||||
diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
|
||||
index 59c9bd0..f824c4c 100644
|
||||
--- a/rsa-sign-tr.c
|
||||
+++ b/rsa-sign-tr.c
|
||||
@@ -239,8 +239,9 @@ static int
|
||||
sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs)
|
||||
{
|
||||
volatile mp_limb_t z = 0;
|
||||
+ size_t i;
|
||||
|
||||
- for (size_t i = 0; i < limbs; i++)
|
||||
+ for (i = 0; i < limbs; i++)
|
||||
{
|
||||
z |= (a[i] ^ b[i]);
|
||||
}
|
||||
--
|
||||
2.19.1
|
||||
|
||||
Reference in New Issue
Block a user