diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-05 22:26:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-09-05 22:26:27 +0200 |
| commit | 9c11fa0311ebf8524d9dc256d8b20c27e48502b2 (patch) | |
| tree | 5bb7657752f1f224f54f860fb787db70804307b6 /package/brutefir/patches/patch-Makefile | |
| parent | 9827ba766a5a2c367df50b603f44037dbeb9a473 (diff) | |
fix build for x86/x86_64
Diffstat (limited to 'package/brutefir/patches/patch-Makefile')
| -rw-r--r-- | package/brutefir/patches/patch-Makefile | 30 |
1 files changed, 27 insertions, 3 deletions
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 |