diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-06-22 09:46:31 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-06-22 09:46:31 +0200 |
| commit | 9ff95796ab9584824946a79de5b3a3434f341255 (patch) | |
| tree | 1b4a5598103f53aab7d259ec8e27a6402b772a65 | |
| parent | 9ca246a83e179609e36869ec8bf0a46a64011e8c (diff) | |
| download | ptxdist-9ff95796ab9584824946a79de5b3a3434f341255.tar.gz ptxdist-9ff95796ab9584824946a79de5b3a3434f341255.tar.xz | |
[setmixer] update patches: don't overwrite LDFLAGS
while here add missing series file
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
3 files changed, 32 insertions, 23 deletions
diff --git a/patches/setmixer_27DEC94ds1.orig/0001-remove-hand-made-m486-option.patch b/patches/setmixer_27DEC94ds1.orig/0001-remove-hand-made-m486-option.patch new file mode 100644 index 000000000..666a68abf --- /dev/null +++ b/patches/setmixer_27DEC94ds1.orig/0001-remove-hand-made-m486-option.patch @@ -0,0 +1,31 @@ +From b4167f1b15d6463a86fa1550c3561a41bcc3a397 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert <j.beisert@pengutronix.de> +Date: Tue, 22 Jun 2010 09:11:00 +0200 +Subject: [PATCH] remove hand-made -m486 option + +Don't use hand made -m<cpu> options. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index bfed9a6..1676ad1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ + DESTDIR = + INSTALL = install + CC=gcc +-CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe -m486 +-LDFLAGS= -Xlinker -N -s ++CFLAGS+= -O6 -fomit-frame-pointer -Wall -pipe ++LDFLAGS+= + PROG=setmixer + + $(PROG): setmixer.o +-- +1.7.1 + diff --git a/patches/setmixer_27DEC94ds1.orig/series b/patches/setmixer_27DEC94ds1.orig/series new file mode 100644 index 000000000..c0a8986ed --- /dev/null +++ b/patches/setmixer_27DEC94ds1.orig/series @@ -0,0 +1 @@ +setmixer-27DEC94ds1-cflags486.diff diff --git a/patches/setmixer_27DEC94ds1.orig/setmixer-27DEC94ds1-cflags486.diff b/patches/setmixer_27DEC94ds1.orig/setmixer-27DEC94ds1-cflags486.diff deleted file mode 100644 index 7a157a7e7..000000000 --- a/patches/setmixer_27DEC94ds1.orig/setmixer-27DEC94ds1-cflags486.diff +++ /dev/null @@ -1,23 +0,0 @@ -Subject: [patch] remove hand-made -m486 option -From: Juergen Beisert <j.beisert@pengutronix.de> - -Don't use hand made -m<cpu> options. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - -diff -urN setmixer-27DEC94ds1.orig/Makefile setmixer-27DEC94ds1.orig-ptx/Makefile ---- setmixer-27DEC94ds1.orig/Makefile 1999-06-27 10:49:28.000000000 +0200 -+++ setmixer-27DEC94ds1.orig-ptx/Makefile 2006-01-02 16:27:16.000000000 +0100 -@@ -1,8 +1,8 @@ - DESTDIR = - INSTALL = install - CC=gcc --CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe -m486 --LDFLAGS= -Xlinker -N -s -+CFLAGS= -O6 -fomit-frame-pointer -Wall -pipe -+LDFLAGS= -lgcc_s - PROG=setmixer - - $(PROG): setmixer.o |