From 9c11fa0311ebf8524d9dc256d8b20c27e48502b2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 5 Sep 2015 22:26:16 +0200
Subject: fix build for x86/x86_64

---
 package/brutefir/Makefile               |  9 +++++----
 package/brutefir/patches/patch-Makefile | 30 +++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/package/brutefir/Makefile b/package/brutefir/Makefile
index fe5e99c9b..cef064554 100644
--- a/package/brutefir/Makefile
+++ b/package/brutefir/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		brutefir
 PKG_VERSION:=		1.0m
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_HASH:=		23b80500fc8687be338bc2654ecc509eccc06fe9372815361b65ed9b1807ccca
 PKG_DESCR:=		convulution engine
 PKG_SECTION:=		mm/audio
@@ -16,7 +16,7 @@ PKG_SITES:=		http://www.ludd.luth.se/~torger/files/
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-MAKE_ENV+= 		FLEX=$(STAGING_HOST_DIR)/usr/bin/flex
+MAKE_ENV+= 		FLEX=$(STAGING_HOST_DIR)/usr/bin/flex UNAME_M=$(ADK_TARGET_ARCH)
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -31,8 +31,9 @@ CONFIG_STYLE=		manual
 brutefir-install:
 	$(INSTALL_DIR) $(IDIR_BRUTEFIR)/usr/bin
 	$(INSTALL_DIR) $(IDIR_BRUTEFIR)/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/local/bin/brutefir \
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/brutefir \
 		$(IDIR_BRUTEFIR)/usr/bin
-	$(CP) $(WRKINST)/usr/local/lib/* $(IDIR_BRUTEFIR)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/* \
+		$(IDIR_BRUTEFIR)/usr/lib/
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/brutefir/patches/patch-Makefile b/package/brutefir/patches/patch-Makefile
index bcd97dc3f..44d7719f9 100644
--- a/package/brutefir/patches/patch-Makefile
+++ b/package/brutefir/patches/patch-Makefile
@@ -1,5 +1,20 @@
 --- brutefir-1.0m.orig/Makefile	2013-11-29 14:55:01.000000000 +0100
-+++ brutefir-1.0m/Makefile	2015-07-26 01:43:09.000000000 +0200
++++ brutefir-1.0m/Makefile	2015-09-05 22:19:20.275180228 +0200
+@@ -1,11 +1,11 @@
+ ###################################
+ # Where to install
+-INSTALL_PREFIX	= $(DESTDIR)/usr/local
++INSTALL_PREFIX	= $(DESTDIR)/usr
+ 
+ ###################################
+ # Where to find libraries, and their header files.
+-LIBPATHS	= -L/usr/local/lib
+-INCLUDE		= -I/usr/local/include
++# LIBPATHS	= -L/usr/local/lib
++# INCLUDE		= -I/usr/local/include
+ ifdef FFTW_PATH
+ LIBPATHS	+= -L$(FFTW_PATH)/lib
+ INCLUDE		+= -I$(FFTW_PATH)/include
 @@ -17,17 +17,17 @@ FFTW_LIB	= -lfftw3 -lfftw3f
  
  ###################################
@@ -23,12 +38,21 @@
  CC_FPIC		= -fPIC
  LD_SHARED	= -shared
  
-@@ -59,7 +59,7 @@ LIB_TARGETS	= cli.bflogic eq.bflogic fil
+@@ -59,15 +59,11 @@ LIB_TARGETS	= cli.bflogic eq.bflogic fil
  
  UNAME		= $(shell uname)
  UNAME_P         = $(shell uname -p)
 -UNAME_M         = $(shell uname -m)
-+UNAME_M         = 
++UNAME_M         ?= 
  
  # Linux
  ifeq ($(UNAME),Linux)
+-ifeq ($(UNAME_M),i586)
+-BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+-CC_FLAGS	+= -msse
+-endif
+-ifeq ($(UNAME_M),i686)
++ifeq ($(UNAME_M),x86)
+ BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+ CC_FLAGS	+= -msse
+ endif
-- 
cgit v1.2.3