diff options
| author | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-05 22:37:30 +0000 |
|---|---|---|
| committer | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-05 22:37:30 +0000 |
| commit | 024647601aa605bbad87331eaf46e4fa9bc04dc7 (patch) | |
| tree | 6b369e61804a82f20e2c6d16c3e7fbc467a0305c /audio/xwave/files/patch-aa | |
| parent | Add pkg-message to tell users about upgrading Berkeley DB files. (diff) | |
fixes for two libfwf-related compilation problems (see comments in
patches)
Submitted by: maintainer
PR: 20705
reported by: Vivek Khera <khera@kciLink.com>
Notes
Notes:
svn path=/head/; revision=39109
Diffstat (limited to 'audio/xwave/files/patch-aa')
| -rw-r--r-- | audio/xwave/files/patch-aa | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/audio/xwave/files/patch-aa b/audio/xwave/files/patch-aa index 9743c8cbb01e..88a801c071c2 100644 --- a/audio/xwave/files/patch-aa +++ b/audio/xwave/files/patch-aa @@ -1,10 +1,36 @@ ---- src/Imakefile.orig Mon Nov 9 08:22:55 1998 -+++ src/Imakefile Fri Jun 30 20:10:38 2000 -@@ -14,7 +14,7 @@ + If /usr/X11R6/lib/libfwf.a exists on the system, (e.g. as a consequence + of building the port /usr/ports/x11-toolkits/FWF before), xwave + links this file instead of its own (older) libfwf.a. + + In src/Imakefile the line + + XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 + + cannot guarantee, that libfwf.a is taken from ../lib, because imake + includes -L/usr/X11R6/lib _BEFORE_ -L../lib. + + I am not experienced in compiler options, but replacing the above line + by + + XLIBS= ../lib/libfwf.a -lXaw -lXpm -lXmu -lXt -lX11 + + does the job. + +--- src/Imakefile.orig Mon Nov 9 00:22:55 1998 ++++ src/Imakefile Mon Jan 1 12:49:37 2001 +@@ -13,8 +13,14 @@ + PROGRAMS= xwave AUDIOLIBS=-L../ccitt -lccitt -L../adpcm2pcm -ladpcm -L../ieee -lieee - XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 +-XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 -LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm -lc ++ ++# XLIBS= -L../lib -lfwf -lXaw -lXpm -lXmu -lXt -lX11 ++# "-L../lib -lfwf" substituted by "../lib/libfwf.a" because Linker ++# used /usr/X11R6/lib/libfwf.a on systems, where this file exists. ++# 2001-01-01 Martin Kraft ++ ++XLIBS= ../lib/libfwf.a -lXaw -lXpm -lXmu -lXt -lX11 +LIBS= $(OSLIBS) $(XLIBS) $(AUDIOLIBS) -lm NormalProgramTarget(xwave,$(OBJS),,$(LIBS),) |