i2pd: fix for avx & aes

2 files changed, 53 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0536db13e8ce..4dd1801991bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = i2pd
 	pkgdesc = Simplified C++ implementation of I2P client
 	pkgver = 2.26.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/PurpleI2P/i2pd
 	install = i2pd.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index ecf7502db33b..25c0abbfb210 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=i2pd
 pkgver=2.26.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"
@@ -23,71 +23,69 @@ etc/$pkgname/tunnels.conf)
 conflicts=("$pkgname-git")
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	cd build
-
-	BUILD_FLAGS='-DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX=/usr
-	-DWITH_UPNP=ON -DWITH_PCH=OFF -DCMAKE_BUILD_TYPE=Release'
-
-	if [ "$CARCH" == "x86_64" ] || [ "$CARCH" == "i686" ]
-	then
-		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
-	fi
-
-	cmake . $BUILD_FLAGS
-	make
+    cd "$srcdir/$pkgname-$pkgver"
+    cd build
+
+    BUILD_FLAGS='-DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX=/usr
+    -DWITH_UPNP=ON -DWITH_PCH=OFF -DCMAKE_BUILD_TYPE=Release'
+
+    if [ "$CARCH" == "x86_64" ] || [ "$CARCH" == "i686" ]
+    then
+        if grep -q -m1 -o aes /proc/cpuinfo
+        then
+            BUILD_FLAGS="${BUILD_FLAGS} -DWITH_AESNI=ON"
+        fi
+
+        if grep -q -m1 -o avx /proc/cpuinfo
+        then
+            BUILD_FLAGS="${BUILD_FLAGS} -DWITH_AVX=ON"
+        fi
+    fi
+
+    cmake . $BUILD_FLAGS
+    make
 }
 
 package(){
-	_conf_dest=etc/${pkgname}
-	_home_dest=var/lib/${pkgname}
-	_share_dest=usr/share
+    _conf_dest=etc/${pkgname}
+    _home_dest=var/lib/${pkgname}
+    _share_dest=usr/share
 
-	cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$pkgname-$pkgver
 
-	cd build
-	make DESTDIR=$pkgdir install
-	install -Dm0644 ../contrib/debian/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-	install -Dm0644 ../contrib/debian/$pkgname.tmpfile $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+    cd build
+    make DESTDIR=$pkgdir install
+    install -Dm0644 ../contrib/debian/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+    install -Dm0644 ../contrib/debian/$pkgname.tmpfile $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
 
-	install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/$pkgname.conf $pkgdir/${_conf_dest}/$pkgname.conf
-	install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
-	install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
+    install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/$pkgname.conf $pkgdir/${_conf_dest}/$pkgname.conf
+    install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/tunnels.conf $pkgdir/${_conf_dest}/tunnels.conf
+    install -Dm0644 $srcdir/$pkgname-$pkgver/contrib/subscriptions.txt $pkgdir/${_conf_dest}/subscriptions.txt
 
-	install -d -m0750 $pkgdir/${_home_dest}
-	ln -s /${_conf_dest}/$pkgname.conf $pkgdir/${_home_dest}/$pkgname.conf
-	ln -s /${_conf_dest}/tunnels.conf $pkgdir/${_home_dest}/tunnels.conf
-	ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
+    install -d -m0750 $pkgdir/${_home_dest}
+    ln -s /${_conf_dest}/$pkgname.conf $pkgdir/${_home_dest}/$pkgname.conf
+    ln -s /${_conf_dest}/tunnels.conf $pkgdir/${_home_dest}/tunnels.conf
+    ln -s /${_conf_dest}/subscriptions.txt $pkgdir/${_home_dest}/subscriptions.txt
 
-	cd $srcdir/$pkgname-$pkgver/contrib
-	_dest="$pkgdir/${_share_dest}/${pkgname}"
-	find ./certificates -type d -exec install -d {} ${_dest}/{} \;
-	find ./certificates -type f -exec install -Dm644 {} ${_dest}/{} \;
-	ln -s /${_share_dest}/${pkgname}/certificates $pkgdir/${_home_dest}/certificates
+    cd $srcdir/$pkgname-$pkgver/contrib
+    _dest="$pkgdir/${_share_dest}/${pkgname}"
+    find ./certificates -type d -exec install -d {} ${_dest}/{} \;
+    find ./certificates -type f -exec install -Dm644 {} ${_dest}/{} \;
+    ln -s /${_share_dest}/${pkgname}/certificates $pkgdir/${_home_dest}/certificates
 
-	# license
-	install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE "$pkgdir/${_share_dest}/licenses/${pkgname}/LICENSE"
+    # license
+    install -Dm644 $srcdir/$pkgname-$pkgver/LICENSE "$pkgdir/${_share_dest}/licenses/${pkgname}/LICENSE"
 
-	# docs
-	_dest="$pkgdir/${_share_dest}/doc/${pkgname}"
-	install -Dm644 $srcdir/$pkgname-$pkgver/README.md "${_dest}/README.md"
+    # docs
+    _dest="$pkgdir/${_share_dest}/doc/${pkgname}"
+    install -Dm644 $srcdir/$pkgname-$pkgver/README.md "${_dest}/README.md"
 
-	# remove src folder and LICENSE
-	rm -r $pkgdir/usr/{src,LICENSE}
+    # remove src folder and LICENSE
+    rm -r $pkgdir/usr/{src,LICENSE}
 
-	#man
-	install -Dm644 $srcdir/$pkgname-$pkgver/debian/$pkgname.1 "$pkgdir/${_share_dest}/man/man1/$pkgname.1"
-	chmod -R o= $pkgdir/${_home_dest}
+    #man
+    install -Dm644 $srcdir/$pkgname-$pkgver/debian/$pkgname.1 "$pkgdir/${_share_dest}/man/man1/$pkgname.1"
+    chmod -R o= $pkgdir/${_home_dest}
 }
 
 md5sums=('78713dce154fb093281cf444265c2e83')