pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk don't put ${RPATH_FLAG} in X11_LDFLAGS if _USE_RPAT...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0362f0623b19
branches:  trunk
changeset: 461972:0362f0623b19
user:      danw <danw%pkgsrc.org@localhost>
date:      Thu Sep 25 02:25:12 2003 +0000

description:
don't put ${RPATH_FLAG} in X11_LDFLAGS if _USE_RPATH==no (darwin)

diffstat:

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

diffs (19 lines):

diff -r 03ccc68883d7 -r 0362f0623b19 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Sep 25 02:13:15 2003 +0000
+++ b/mk/bsd.pkg.mk     Thu Sep 25 02:25:12 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1289 2003/09/24 12:22:03 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1290 2003/09/25 02:25:12 danw Exp $
 #
 # This file is in the public domain.
 #
@@ -394,7 +394,9 @@
 FIX_RPATH+=            LIBS
 .if defined(USE_X11)
 X11_LDFLAGS=           # empty
+.  if empty(_USE_RPATH:M[nN][oO])
 X11_LDFLAGS+=          -Wl,${RPATH_FLAG}${X11BASE}/lib
+.  endif
 X11_LDFLAGS+=          -L${X11BASE}/lib
 .endif
 .if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO])



Home | Main Index | Thread Index | Old Index