Don't use extra commans in "-Wl" commands which apparently cause problems

with either the "libtool" or "buildlink3" framework. This fixes the build
problem discovered in recent bulk builds.
This commit is contained in:
tron 2004-09-28 15:26:09 +00:00
parent f660691824
commit 1b89d43900
2 changed files with 20 additions and 8 deletions

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.2 2004/02/22 10:00:31 jmmv Exp $
$NetBSD: distinfo,v 1.3 2004/09/28 15:26:09 tron Exp $
SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
Size (fxtv-1.03.tgz) = 198669 bytes
SHA1 (patch-aa) = cd994d512fe99e962cc9c505285da63d1421f81e
SHA1 (patch-aa) = 6479f8e0930390dd5fcdf38c3f850ad355829db0
SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7

View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
$NetBSD: patch-aa,v 1.2 2004/09/28 15:26:09 tron Exp $
--- Makefile.orig Mon Feb 12 23:08:59 2001
+++ Makefile
--- Makefile.orig 2001-02-12 23:08:59.000000000 +0100
+++ Makefile 2004-09-28 17:22:05.000000000 +0200
@@ -4,13 +4,10 @@
HAVE_XFREE86 = YES
@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
LOCALBASE ?= /usr/local
DEBUG = NO
OS = $(shell uname -s)
@@ -24,15 +21,6 @@ override LIBDIRS = $(X11BASE)/
@@ -24,15 +21,6 @@
override SHELL = /bin/sh
#
@ -34,7 +34,19 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
# OpenBSD stuff
#
ifeq ($(OS),OpenBSD)
@@ -72,6 +60,15 @@ endif
@@ -51,9 +39,9 @@
override RPATH_FLAG = -R
endif
-override LD_INC = $(foreach dir,$(LIBDIRS),-Wl,-L,$(dir))
+override LD_INC = $(foreach dir,$(LIBDIRS),-Wl,-L$(dir))
ifneq ($(RPATH_FLAG),)
- override LD_INC += $(foreach dir,$(LIBDIRS),-Wl,$(RPATH_FLAG),$(dir))
+ override LD_INC += $(foreach dir,$(LIBDIRS),-Wl,$(RPATH_FLAG)$(dir))
endif
#
@@ -72,6 +60,15 @@
override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"
@ -50,7 +62,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
ifeq ($(OS), linux)
override CFLAGS = $(CFLAGS) -DOLD_TUNER_IFACE
endif
@@ -81,7 +78,7 @@ endif
@@ -81,7 +78,7 @@
#
override LDFLAGS = $(LD_INC)
override VIDEOLIB_LIB = $(VIDEOLIB_DIR)/libvideo.a