pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Sense of a USE_BUILDLINK3 test was reversed when US...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/04b013f6ddf7
branches:  trunk
changeset: 492318:04b013f6ddf7
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Apr 09 23:16:45 2005 +0000

description:
Sense of a USE_BUILDLINK3 test was reversed when USE_BUILDLINK3 was
switched on always, resulting in instances of X11R6/lib libraries being
linked in to binaries along with pkgsrc versions of the same. Fix.

diffstat:

 mk/bsd.pkg.use.mk |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r e6021ed9357f -r 04b013f6ddf7 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Sat Apr 09 22:45:07 2005 +0000
+++ b/mk/bsd.pkg.use.mk Sat Apr 09 23:16:45 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.7 2005/03/24 17:46:00 tv Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.8 2005/04/09 23:16:45 markd Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -187,7 +187,6 @@
 .if defined(USE_X11)
 X11_LDFLAGS+=          ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
 X11_LDFLAGS+=          -L${X11BASE}/lib${LIBABISUFFIX}
-LDFLAGS+=              ${X11_LDFLAGS}
 .endif
 
 ### USE_XPKGWEDGE



Home | Main Index | Thread Index | Old Index