i2pd: reverted conditional flags

2 files changed, 18 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c455d6100a4a..9e93daecf0b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = i2pd
 	pkgdesc = Simplified C++ implementation of I2P client
 	pkgver = 2.25.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index a36228185bd2..053b92b48786 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=i2pd
 pkgver=2.25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simplified C++ implementation of I2P client"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/PurpleI2P/$pkgname"
@@ -25,13 +25,22 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	cd build
 
-	cmake . -DCMAKE_CXX_FLAGS="-w" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_UPNP=ON \
-		-DWITH_PCH=OFF \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DWITH_AESNI=ON \
-		-DWITH_AVX=ON
+	BUILD_FLAGS='-DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX=/usr
+	-DWITH_UPNP=ON -DWITH_PCH=OFF -DCMAKE_BUILD_TYPE=Release'
+
+	grep -q -m1 -o aes /proc/cpuinfo
+	if [ $? -eq 0 ]
+	then
+		BUILD_FLAGS="${BUILD_FLAGS} -DWITH_AESNI=ON"
+	fi
+
+	grep -q -m1 -o avx /proc/cpuinfo
+	if [ $? -eq 0 ]
+	then
+		BUILD_FLAGS="${BUILD_FLAGS} -DWITH_AVX=ON"
+	fi
+
+	cmake . $BUILD_FLAGS
 	make
 }