diff options
| author | grant <grant@pkgsrc.org> | 2003-01-23 01:32:56 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-01-23 01:32:56 +0000 |
| commit | e69875050d72aa05fdd9a784bedf457584c4316e (patch) | |
| tree | 6ba4db3c2903db810782540a59b247c55b69295a | |
| parent | f94cd253c57ae07d904592dbef1cb4943963bc35 (diff) | |
| download | pkgsrc-e69875050d72aa05fdd9a784bedf457584c4316e.tar.gz | |
don't make the assumption we are using gcc and pass -Wall.
fixes PR pkg/19996 from Jonathan Perkin.
also, don't unnecessarily add -Wl,-R... since LDFLAGS already
has it.
| -rw-r--r-- | wm/evilwm/distinfo | 4 | ||||
| -rw-r--r-- | wm/evilwm/patches/patch-aa | 21 |
2 files changed, 11 insertions, 14 deletions
diff --git a/wm/evilwm/distinfo b/wm/evilwm/distinfo index 8c8029f0c3b..71ffc1b67ac 100644 --- a/wm/evilwm/distinfo +++ b/wm/evilwm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2003/01/19 06:07:19 salo Exp $ +$NetBSD: distinfo,v 1.5 2003/01/23 01:32:56 grant Exp $ SHA1 (evilwm_0.99.14.orig.tar.gz) = 79f1fedab90615e3ae39dba321c87512cfc35ec6 Size (evilwm_0.99.14.orig.tar.gz) = 22887 bytes -SHA1 (patch-aa) = e84cf4c26293efd4f8c726cb4d85eac5acf18269 +SHA1 (patch-aa) = 10b4d794743d831462fc32ab2763179728dd3800 diff --git a/wm/evilwm/patches/patch-aa b/wm/evilwm/patches/patch-aa index 9a46bafc253..d01e96e964f 100644 --- a/wm/evilwm/patches/patch-aa +++ b/wm/evilwm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2003/01/19 06:07:19 salo Exp $ +$NetBSD: patch-aa,v 1.5 2003/01/23 01:32:56 grant Exp $ ---- Makefile.orig Thu Dec 5 21:35:00 2002 -+++ Makefile Sun Jan 19 06:58:29 2003 -@@ -1,13 +1,13 @@ +--- Makefile.orig Fri Dec 6 07:35:00 2002 ++++ Makefile +@@ -1,11 +1,11 @@ # If you don't use CC -CC = gcc +#CC = gcc @@ -15,12 +15,9 @@ $NetBSD: patch-aa,v 1.4 2003/01/19 06:07:19 salo Exp $ -XROOT = /usr/X11R6 +XROOT = ${X11PREFIX} INCLUDES = -I$(XROOT)/include --LDPATH = -L$(XROOT)/lib -+LDPATH = -L$(XROOT)/lib -Wl,-R$(XROOT)/lib + LDPATH = -L$(XROOT)/lib LIBS = -lX11 - - # Configure evilwm by editing the following DEFINES lines. -@@ -22,7 +22,7 @@ +@@ -22,7 +22,7 @@ DEFINES += -DINFOBANNER # Use Motif hints to find if a window should be borderless. # To use this option, you need to have the Motif development files installed. @@ -29,17 +26,17 @@ $NetBSD: patch-aa,v 1.4 2003/01/19 06:07:19 salo Exp $ # To support virtual desktops, uncomment one or both of the following 2 lines. DEFINES += -DVWM -@@ -66,7 +66,8 @@ +@@ -66,7 +66,8 @@ disttar = evilwm_$(version).$(revision). #DEFINES += -DXDEBUG # show some X calls DEFINES += -DVERSION=\"$(version).$(revision).$(subrev)\" $(DEBIAN) -CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall -+CFLAGS += $(INCLUDES) $(DEFINES) -Wall ++CFLAGS += $(INCLUDES) $(DEFINES) +#CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall LDFLAGS += $(LDPATH) $(LIBS) -@@ -89,10 +90,8 @@ +@@ -89,10 +90,8 @@ allinone: doinstall: if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi |