diff options
| author | Arun Raghavan <arun@centricular.com> | 2016-02-18 12:13:28 +0530 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2016-02-18 12:14:03 +0530 |
| commit | 431d6aa6c62ce019eaefd399a6c68ca8c34451cf (patch) | |
| tree | 89b4e5dd8b0a6acd8da3e379fa3e8d1c341a042f | |
| parent | e7f44f2c1263d81de3e57e078d779b7e9ebdc19b (diff) | |
tinyalsa: Drop patch that has now been merged upstream
| -rw-r--r-- | recipes/tinyalsa.recipe | 2 | ||||
| -rw-r--r-- | recipes/tinyalsa/0001-build-Don-t-hardcode-build-commands.patch | 68 |
2 files changed, 0 insertions, 70 deletions
diff --git a/recipes/tinyalsa.recipe b/recipes/tinyalsa.recipe index 539f801a..aa02c638 100644 --- a/recipes/tinyalsa.recipe +++ b/recipes/tinyalsa.recipe @@ -14,8 +14,6 @@ class Recipe(recipe.Recipe): remotes = {'origin': 'git://github.com/tinyalsa/tinyalsa'} commit = 'origin/master' - patches = [ 'tinyalsa/0001-build-Don-t-hardcode-build-commands.patch' ] - files_devel = [ 'include/tinyalsa/asoundlib.h' ] files_libs = [ 'libtinyalsa' ] diff --git a/recipes/tinyalsa/0001-build-Don-t-hardcode-build-commands.patch b/recipes/tinyalsa/0001-build-Don-t-hardcode-build-commands.patch deleted file mode 100644 index 0452e177..00000000 --- a/recipes/tinyalsa/0001-build-Don-t-hardcode-build-commands.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 85135612e465059b725b1c7ce1a7c1c34bc8a667 Mon Sep 17 00:00:00 2001 -From: Arun Raghavan <git@arunraghavan.net> -Date: Thu, 28 Jan 2016 13:11:42 +0530 -Subject: [PATCH] build: Don't hardcode build commands - -Allows us to use overrides from the environment, which is useful for -packaging. ---- - Makefile | 35 ++++++++++++++++++++--------------- - 1 file changed, 20 insertions(+), 15 deletions(-) - -diff --git a/Makefile b/Makefile -index f172a13..758f736 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,29 +1,34 @@ --CFLAGS = -c -fPIC -Wall -+CFLAGS ?= -Wall -+LDFLAGS ?= - INC = include - OBJECTS = mixer.o pcm.o --LIB = libtinyalsa.so -+LIB = libtinyalsa.a -+SHLIB = libtinyalsa.so - CROSS_COMPILE = - --all: $(LIB) tinyplay tinycap tinymix tinypcminfo -+all: $(LIB) $(SHLIB) tinyplay tinycap tinymix tinypcminfo - --tinyplay: $(LIB) tinyplay.o -- $(CROSS_COMPILE)gcc tinyplay.o -L. -ltinyalsa -o tinyplay -+tinyplay: $(SHLIB) tinyplay.o -+ $(CROSS_COMPILE)$(CC) $(LDFLAGS) tinyplay.o -L. -ltinyalsa -o tinyplay - --tinycap: $(LIB) tinycap.o -- $(CROSS_COMPILE)gcc tinycap.o -L. -ltinyalsa -o tinycap -+tinycap: $(SHLIB) tinycap.o -+ $(CROSS_COMPILE)$(CC) $(LDFLAGS) tinycap.o -L. -ltinyalsa -o tinycap - --tinymix: $(LIB) tinymix.o -- $(CROSS_COMPILE)gcc tinymix.o -L. -ltinyalsa -o tinymix -+tinymix: $(SHLIB) tinymix.o -+ $(CROSS_COMPILE)$(CC) $(LDFLAGS) tinymix.o -L. -ltinyalsa -o tinymix - --tinypcminfo: $(LIB) tinypcminfo.o -- $(CROSS_COMPILE)gcc tinypcminfo.o -L. -ltinyalsa -o tinypcminfo -+tinypcminfo: $(SHLIB) tinypcminfo.o -+ $(CROSS_COMPILE)$(CC) $(LDFLAGS) tinypcminfo.o -L. -ltinyalsa -o tinypcminfo -+ -+$(SHLIB): $(OBJECTS) -+ $(CROSS_COMPILE)$(CC) $(LDFLAGS) -shared $(OBJECTS) -o $(SHLIB) - - $(LIB): $(OBJECTS) -- $(CROSS_COMPILE)gcc -shared $(OBJECTS) -o $(LIB) -+ $(CROSS_COMPILE)$(AR) rcs $@ $^ - --.c.o: -- $(CROSS_COMPILE)gcc $(CFLAGS) $< -I$(INC) -+%.o: %.c -+ $(CROSS_COMPILE)$(CC) $(CFLAGS) -fPIC -c $^ -I$(INC) -o $@ - - clean: -- -rm $(LIB) $(OBJECTS) tinyplay.o tinyplay tinycap.o tinycap \ -+ -rm $(LIB) $(SHLIB) $(OBJECTS) tinyplay.o tinyplay tinycap.o tinycap \ - tinymix.o tinymix tinypcminfo.o tinypcminfo --- -2.5.0 - |