diff options
| author | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
| commit | 9d817a0670ab62446c7e477d722a0da1c8c7e489 (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /x11/Xaw-Xpm | |
| parent | 173784dbf29b9a9d5e49dcecae83fbc5794121e0 (diff) | |
| download | pkgsrc-9d817a0670ab62446c7e477d722a0da1c8c7e489.tar.gz | |
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
C++ for compilation without including the proper headers
Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'x11/Xaw-Xpm')
| -rw-r--r-- | x11/Xaw-Xpm/buildlink3.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index ba3fdfdcbda..d0e0977fc3b 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/12/27 13:37:42 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW_XPM_BUILDLINK3_MK:= ${XAW_XPM_BUILDLINK3_MK}+ @@ -22,8 +22,8 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - -L${BUILDLINK_PREFIX.xpm}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.xpm}/lib \ + -L${BUILDLINK_PREFIX.libXpm}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib \ -lXaw3d -lXpm BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |