diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-07 07:11:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-07 07:11:34 +0000 |
| commit | 6990004f974f06076604c546c8e3590243414a42 (patch) | |
| tree | 7cccbc42c848323d9ea260187afd52146884217e /mk | |
| parent | dfa2eafdc629598bc51b5c20f681a12a2cd5e3e0 (diff) | |
| download | pkgsrc-6990004f974f06076604c546c8e3590243414a42.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index a687400e906..abc188072e3 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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 @@ _BLNK_TRANSFORM+= rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir_}} # 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:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}} _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+= L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}} # _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. |