[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Be more precise about when rules are emi...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6a8a0d70572
branches:  trunk
changeset: 465858:c6a8a0d70572
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 07 07:11:34 2004 +0000

description:
Be more precise about when rules are emitted in the tranform and
untransform cases.  This should fix the problem noted on tech-pkg@:
"Re: graphics/gdk-pixbuf can't find <gdk/gdk.h> build problem" where the
CFLAGS for glib were being eaten by the unbuildlink step.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 0521ded41fe9 -r c6a8a0d70572 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Wed Jan 07 07:10:05 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Wed Jan 07 07:11:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.40 2004/01/07 06:47:29 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.41 2004/01/07 07:11:34 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -693,7 +693,8 @@
 # are just found in the default view.
 #
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
-_BLNK_TRANSFORM+=      depot:${DEPOTBASE}:${LOCALBASE}
+_BLNK_TRANSFORM+=      transform:depot:${DEPOTBASE}:${LOCALBASE}
+_BLNK_TRANSFORM+=      untransform:depot:${DEPOTBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 .endif
 #
 # Convert direct paths to shared libraries into "-Ldir -llib" equivalents.
@@ -711,6 +712,11 @@
 _BLNK_TRANSFORM+=      P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 .endif
 #
+# Explicitly remove everything that's an absolute path when
+# untransforming.
+#
+_BLNK_TRANSFORM+=      untransform:r:
+#
 # Transform references into ${X11BASE} into ${BUILDLINK_X11_DIR}.
 #
 .if defined(USE_X11)
@@ -729,10 +735,10 @@
 #
 _BLNK_TRANSFORM+=      ${BUILDLINK_TRANSFORM}
 #
-# Explicitly remove everything else that's an absolute path, since we've
-# already protected the ones we care about.
+# Explicitly remove everything else that's an absolute path when
+# transforming, since we've already protected the ones we care about.
 #
-_BLNK_TRANSFORM+=       r:
+_BLNK_TRANSFORM+=       transform:r:
 #
 # Remove -Wl,-R* and *-rpath* if _USE_RPATH == "no".
 # Transform -Wl,-R* and *-rpath* if Sun compilers are used.