[arch-commits] Commit in i2pd/trunk (060-i2pd-2.35.0-fix-avx-detection.patch PKGBUILD)

[Daniel Bermond]

    Date: Saturday, December 26, 2020 @ 16:01:02
  Author: dbermond
Revision: 793015

upgpkg: i2pd 2.35.0-4: fix FS#69092

Added:
  i2pd/trunk/060-i2pd-2.35.0-fix-avx-detection.patch
Modified:
  i2pd/trunk/PKGBUILD

-----------------------------------------+
 060-i2pd-2.35.0-fix-avx-detection.patch |   22 ++++++++++++++++++++++
 PKGBUILD                                |    5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

Added: 060-i2pd-2.35.0-fix-avx-detection.patch
===================================================================
--- 060-i2pd-2.35.0-fix-avx-detection.patch	                        (rev 0)
+++ 060-i2pd-2.35.0-fix-avx-detection.patch	2020-12-26 16:01:02 UTC (rev 793015)
@@ -0,0 +1,22 @@
+--- a/libi2pd/Crypto.cpp
++++ b/libi2pd/Crypto.cpp
+@@ -638,7 +638,7 @@ namespace crypto
+ 	{
+ 		uint64_t buf[256];
+ 		uint64_t hash[12]; // 96 bytes
+-#if defined(__x86_64__) || defined(__i386__)
++#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600)
+ 		if(i2p::cpu::avx)
+ 		{
+ 			__asm__
+--- a/libi2pd/Identity.cpp
++++ b/libi2pd/Identity.cpp
+@@ -828,7 +828,7 @@ namespace data
+ 	XORMetric operator^(const IdentHash& key1, const IdentHash& key2)
+ 	{
+ 		XORMetric m;
+-#if defined(__x86_64__) || defined(__i386__)
++#if (defined(__x86_64__) || defined(__i386__)) && defined(__AVX__) // not all X86 targets supports AVX (like old Pentium, see #1600)
+ 		if(i2p::cpu::avx)
+ 		{
+ 			__asm__

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-26 13:07:11 UTC (rev 793014)
+++ PKGBUILD	2020-12-26 16:01:02 UTC (rev 793015)
@@ -10,7 +10,7 @@
 
 pkgname=i2pd
 pkgver=2.35.0
-pkgrel=3
+pkgrel=4
 pkgdesc='A full-featured C++ implementation of the I2P router'
 arch=('x86_64')
 url='https://i2pd.website/'
@@ -26,6 +26,7 @@
         '030-i2pd-do-not-override-config.patch'
         '040-i2pd-systemd-service-hardening.patch'
         '050-i2pd-tunnels-d-readme.patch'
+        '060-i2pd-2.35.0-fix-avx-detection.patch'
         'i2pd.sysusers'
         'i2pd.tmpfiles')
 sha256sums=('d041fd4e7a88ac168e76f66fdab40174ad093cdc13451cdbd0dd1216e5581f8a'
@@ -34,6 +35,7 @@
             '45cfc3035c5b5cfc92cfffec1fe7d7efc4fed3229195cdb640ec4a6c405af149'
             '578ed9767890e970bd93b44e3be85c2595c4149ed65e4cc1c79ea12e2cb6982e'
             'cfcb6b07b67aff3e3af12767f4649d88b9320dc71907b6c01b465e5c138cdaa3'
+            '3434318864ff7adc55ddcb3b6d625642dc443ac7249469011bbbfb598fb99689'
             '88b2e709228049ba11f37863f87de75ab6cde295104852871384337cfdc906a3'
             'fe8cc2ec83cb5b5c2b2ec8cce9a989e0cb6fd347e00b84e03a17b12efd152fac')
 
@@ -43,6 +45,7 @@
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/030-i2pd-do-not-override-config.patch"
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/040-i2pd-systemd-service-hardening.patch"
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/050-i2pd-tunnels-d-readme.patch"
+    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/060-i2pd-2.35.0-fix-avx-detection.patch"
 }
 
 build() {