From f7cc27d9b2e14cd473a6dfad864099066dd038cb Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 11 Feb 2018 20:42:19 +0100
Subject: [PATCH] arm-mem: update to a3277ce

Use -v7 library for RPi2 and Slice3, -v6 for other devices

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/devel/arm-mem/package.mk | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk
index 784b599aa1..aaf405a5b5 100644
--- a/packages/devel/arm-mem/package.mk
+++ b/packages/devel/arm-mem/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="arm-mem"
-PKG_VERSION="3aee5f4"
-PKG_SHA256="c7ac6fea60c01d34e71b24065b65ad6fbef42b9b702a226a22fe4a0caff33382"
+PKG_VERSION="a3277ce"
+PKG_SHA256="f571bbc43e3670c8f52447eb885f0c561ed039bcfb692678681899d7df13b165"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/bavison/arm-mem"
@@ -29,7 +29,13 @@ PKG_SECTION="devel"
 PKG_SHORTDESC="arm-mem: ARM-accelerated versions of selected functions from string.h"
 PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h"
 
-PKG_MAKE_OPTS_TARGET="libarmmem.so"
+if [ "$DEVICE" = "RPi2" -o "$DEVICE" = "Slice3" ] ; then
+  PKG_LIB_ARM_MEM="libarmmem-v7l.so"
+else
+  PKG_LIB_ARM_MEM="libarmmem-v6l.so"
+fi
+
+PKG_MAKE_OPTS_TARGET="$PKG_LIB_ARM_MEM"
 
 pre_make_target() {
   export CROSS_COMPILE=$TARGET_PREFIX
@@ -42,16 +48,16 @@ make_init() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib
-    cp -P libarmmem.so $INSTALL/usr/lib
+    cp -P $PKG_LIB_ARM_MEM $INSTALL/usr/lib
 
   mkdir -p $INSTALL/etc
-    echo "/usr/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/usr/lib/$PKG_LIB_ARM_MEM" >> $INSTALL/etc/ld.so.preload
 }
 
 makeinstall_init() {
   mkdir -p $INSTALL/usr/lib
-    cp -P libarmmem.so $INSTALL/usr/lib
+    cp -P $PKG_LIB_ARM_MEM $INSTALL/usr/lib
 
   mkdir -p $INSTALL/etc
-    echo "/usr/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload
+    echo "/usr/lib/$PKG_LIB_ARM_MEM" >> $INSTALL/etc/ld.so.preload
 }