diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-11-29 10:29:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-11-29 10:29:39 +0100 |
| commit | af8c42072f2d80e99bf9966bf1c42d3e65e2b27c (patch) | |
| tree | 337cdb874bc434ef80b4474426d58dd9cb6d44be /package/brutefir | |
| parent | 6e19354a76269cd0f20b1aedb82f693f5c685c5d (diff) | |
brutefir: fix runtime problems on hummingboard, reported by Oliver
Diffstat (limited to 'package/brutefir')
| -rw-r--r-- | package/brutefir/Makefile | 5 | ||||
| -rw-r--r-- | package/brutefir/patches/patch-Makefile | 37 |
2 files changed, 39 insertions, 3 deletions
diff --git a/package/brutefir/Makefile b/package/brutefir/Makefile index cef064554..23577ad23 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:= 3 +PKG_RELEASE:= 4 PKG_HASH:= 23b80500fc8687be338bc2654ecc509eccc06fe9372815361b65ed9b1807ccca PKG_DESCR:= convulution engine PKG_SECTION:= mm/audio @@ -26,6 +26,9 @@ ifeq ($(ADK_TARGET_ARCH_X86)$(ADK_TARGET_ARCH_X86_64),y) TARGET_CFLAGS+= -msse endif +GCCPATH:= $(subst libgcc.a,,$(shell $(TARGET_CC) -print-libgcc-file-name)) +XAKE_FLAGS+= LIBPATHS="-L$(GCCPATH)" + CONFIG_STYLE= manual brutefir-install: diff --git a/package/brutefir/patches/patch-Makefile b/package/brutefir/patches/patch-Makefile index 44d7719f9..a93fdeeb7 100644 --- a/package/brutefir/patches/patch-Makefile +++ b/package/brutefir/patches/patch-Makefile @@ -1,5 +1,5 @@ --- brutefir-1.0m.orig/Makefile 2013-11-29 14:55:01.000000000 +0100 -+++ brutefir-1.0m/Makefile 2015-09-05 22:19:20.275180228 +0200 ++++ brutefir-1.0m/Makefile 2015-11-29 10:28:02.031683531 +0100 @@ -1,11 +1,11 @@ ################################### # Where to install @@ -24,8 +24,8 @@ -CC = gcc -AS = as +#FLEX = flex -+#LD = ld +#CC = gcc ++#LD = ld +#AS = as ################################### @@ -56,3 +56,36 @@ BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS) CC_FLAGS += -msse endif +@@ -127,25 +123,25 @@ bfconf_lexical.o: bfconf_lexical.c + $(FLEX) -o$@ $< + + brutefir: $(BRUTEFIR_OBJS) +- $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS) ++ $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS) -lgcc + + alsa.bfio: $(BFIO_ALSA_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc ++ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc -lgcc + + oss.bfio: $(BFIO_OSS_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc ++ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc -lgcc + + jack.bfio: $(BFIO_JACK_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc ++ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc -lgcc + + file.bfio: $(BFIO_FILE_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc ++ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc -lgcc + + cli.bflogic: $(BFLOGIC_CLI_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc ++ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc -lgcc + + eq.bflogic: $(BFLOGIC_EQ_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc ++ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc -lgcc + + install: $(BIN_TARGETS) $(LIB_TARGETS) + install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir |