diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-21 02:19:36 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-21 02:19:36 +0000 |
| commit | 8a3ce1bc7aab38776cb8fdb379eb655fff5e5854 (patch) | |
| tree | e924063e7b3a1faefc391f09f98b266b9787468f /media-sound/aylet/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-8a3ce1bc7aab38776cb8fdb379eb655fff5e5854.tar.gz gentoo-2-8a3ce1bc7aab38776cb8fdb379eb655fff5e5854.tar.bz2 gentoo-2-8a3ce1bc7aab38776cb8fdb379eb655fff5e5854.zip | |
Respect LDFLAGS wrt #333729 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/aylet/files')
| -rw-r--r-- | media-sound/aylet/files/aylet-0.5-gtk.patch | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/media-sound/aylet/files/aylet-0.5-gtk.patch b/media-sound/aylet/files/aylet-0.5-gtk.patch index 72972ec1b9ff..7c1ad74a693d 100644 --- a/media-sound/aylet/files/aylet-0.5-gtk.patch +++ b/media-sound/aylet/files/aylet-0.5-gtk.patch @@ -1,6 +1,20 @@ -diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile ---- aylet-0.5.orig/Makefile 2005-12-18 05:05:08.000000000 +0200 -+++ aylet-0.5/Makefile 2007-07-25 17:14:19.000000000 +0300 +--- Makefile ++++ Makefile +@@ -2,12 +2,12 @@ + + # You need an ANSI C compiler. gcc is probably best. + # +-CC=gcc ++CC?=gcc + + # Compiler options (and sound driver) to use. This one is for Linux, + # and other OSS-using systems. + # +-CFLAGS=-O -Wall -DDRIVER_OSS ++CFLAGS+=-Wall -DDRIVER_OSS + + # for OpenBSD, uncomment this: + #CFLAGS=-O -Wall -DDRIVER_OPENBSD @@ -39,14 +39,29 @@ all: aylet xaylet @@ -21,11 +35,12 @@ diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile +gtk2: all + aylet: $(OBJS) - $(CC) -o aylet $(OBJS) $(CURSES_LIB) +- $(CC) -o aylet $(OBJS) $(CURSES_LIB) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o aylet $(OBJS) $(CURSES_LIB) xaylet: $(XOBJS) - $(CC) -o xaylet $(XOBJS) `gtk-config --libs` -+ $(CC) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs` ++ $(CC) $(LDFLAGS) $(CFLAGS) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs` uigtk.o: uigtk.c - $(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o @@ -33,9 +48,8 @@ diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile installdirs: /bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR) -diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c ---- aylet-0.5.orig/ui.c 2003-11-27 21:42:47.000000000 +0200 -+++ aylet-0.5/ui.c 2007-07-25 17:14:53.000000000 +0300 +--- ui.c ++++ ui.c @@ -5,7 +5,9 @@ */ @@ -57,10 +71,8 @@ diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c } /* update time display */ -Only in aylet-0.5: ui.c.orig -diff -ur aylet-0.5.orig/uigtk.c aylet-0.5/uigtk.c ---- aylet-0.5.orig/uigtk.c 2002-09-14 18:45:45.000000000 +0300 -+++ aylet-0.5/uigtk.c 2007-07-25 17:14:22.000000000 +0300 +--- uigtk.c ++++ uigtk.c @@ -14,11 +14,13 @@ #include "ui.h" |