diff options
| author | skrll <skrll> | 2001-04-05 16:03:51 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2001-04-05 16:03:51 +0000 |
| commit | 558c1ceb0964e5cccf81c8f0d895d2702b025b47 (patch) | |
| tree | a25ce29ad8e6f21096dd70ecf0c0aa73056a42d3 /audio | |
| parent | 30c38e8ca3cd76daec274505915c5bcb4f5d3031 (diff) | |
| download | pkgsrc-558c1ceb0964e5cccf81c8f0d895d2702b025b47.tar.gz | |
Make timidity build environment honour LDFLAGS settings. This should fix
build problems when using xpkgwedge.
Reported by Rex McMaster <rmcm@compsoft.com.au> in pkg/12555
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/kdemultimedia2/files/patch-sum | 4 | ||||
| -rw-r--r-- | audio/kdemultimedia2/patches/patch-ac | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/audio/kdemultimedia2/files/patch-sum b/audio/kdemultimedia2/files/patch-sum index 387426e9fe2..d3a6efd4910 100644 --- a/audio/kdemultimedia2/files/patch-sum +++ b/audio/kdemultimedia2/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.2 2001/03/15 15:35:55 skrll Exp $ +$NetBSD: patch-sum,v 1.3 2001/04/05 16:03:51 skrll Exp $ SHA1 (patch-aa) = 2bfbac804f2170546163ad56cedb3e6501f9f841 SHA1 (patch-ab) = 364d905ff5379535285d3c5d462607c0020451d3 -SHA1 (patch-ac) = 12c40ebb716110873cdd90ecc572ffa370a6d5d1 +SHA1 (patch-ac) = 9981b9eae552aead074cee46bd0c065dca2e1fca SHA1 (patch-ad) = d32a98772d5367d7230f69b8984913e9c6ab1267 SHA1 (patch-ae) = 7f741e996af8e5c542a5cf4654ebee8d18a5a380 SHA1 (patch-af) = 4e25ac0e3d25ffb3ed3d22da69214d12b75eff0c diff --git a/audio/kdemultimedia2/patches/patch-ac b/audio/kdemultimedia2/patches/patch-ac index 8197dc9654a..53041008969 100644 --- a/audio/kdemultimedia2/patches/patch-ac +++ b/audio/kdemultimedia2/patches/patch-ac @@ -1,13 +1,31 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 16:14:08 skrll Exp $ +$NetBSD: patch-ac,v 1.2 2001/04/05 16:03:52 skrll Exp $ --- kmidi/TIMIDITY/Makefile.in.orig Wed Feb 21 11:00:20 2001 +++ kmidi/TIMIDITY/Makefile.in -@@ -264,7 +264,7 @@ +@@ -263,8 +263,8 @@ + INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags` AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS) @GXXOPTIMIZE_TRUE@CFLAGS = -O3 -fomit-frame-pointer -ffast-math - LDFLAGS = `$(ARTSCCONFIG) --libs` +-LDFLAGS = `$(ARTSCCONFIG) --libs` -LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm ++timidity_LDFLAGS = `$(ARTSCCONFIG) --libs` +LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lm # Where to install the patches, config files, and MIDI files. # If you change this, it's a good idea to recompile the binary, +@@ -289,6 +289,7 @@ + + + DEFS = @DEFS@ -I. -I$(srcdir) -I../.. ++LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ +@@ -324,7 +325,6 @@ + @KDE_USE_FINAL_TRUE@timidity_OBJECTS = $(timidity_final_OBJECTS) + timidity_LDADD = $(LDADD) + timidity_DEPENDENCIES = +-timidity_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) |