On Sat, 31 Jan 2004, Jeremy C. Reed wrote:

> On Sat, 31 Jan 2004, Min Sik Kim wrote:
>
> > Did you try 'find work.puget/.x11-buildlink/'?
>
> I guess you mean .buildlink-x11. Normally it is the same directory (a
> symlink to .buildlink).

Okay I looked at this again. I see it is work/.x11-buildlink and it is not
a symlink. (That must be for buildlink3.)

> > lines in mk/buildlink3/bsd.buildlink3.mk (lines 497-500).
> >
> > 	case ${BUILDLINK_PREFIX.${_pkg_}} in				\
> > 	${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;		\
> > 	*)              buildlink_dir="${BUILDLINK_DIR}" ;;		\
> > 	esac;								\
> >
> > So, if X11BASE = BUILDLINK_PREFIX.glib as in your case, buildlink is
> > done in BUILDLINK_X11_DIR, instead of BUILDLINK_DIR.

I had modified that in my bsd.buildlink2.mk by checking if X11BASE was
LOCALBASE, but not in my bsd.buildlink3.mk yet.

> > It doesn't matter if USE_X11 is set, because then BUILDLINK_X11_DIR is
> > just a symlink to BUILDLINK_DIR.

Is there ever a time when it should not be a symlink?

I was able to workaround this ORBit problem with:

diff -b -u -r1.65 bsd.buildlink3.mk
--- bsd.buildlink3.mk	30 Jan 2004 10:56:11 -0000	1.65
+++ bsd.buildlink3.mk	1 Feb 2004 03:35:42 -0000
@@ -47,7 +47,11 @@

 ECHO_BUILDLINK_MSG?=	${TRUE}
 BUILDLINK_DIR=		${WRKDIR}/.buildlink
+.if ${LOCALBASE} == ${X11BASE}
+BUILDLINK_X11_DIR=	${BUILDLINK_DIR}
+.else
 BUILDLINK_X11_DIR=	${BUILDLINK_DIR:H}/.x11-buildlink
+.endif
 BUILDLINK_SHELL?=	${SH}
 BUILDLINK_OPSYS?=	${OPSYS}


Now I need to figure out why when building qt3-libs my xlibs aren't link
correct because  ${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}} is empty.
Probably because I have
.include       "../../new/xlibs/buildlink2.mk
instead of the
BUILD_DEPENDS+=                x11-links>=0.19:../../pkgtools/x11-link

Probably I can't have a .include of a buildlink2.mk file in that
bsd.buildlink2.mk file.


   Jeremy C. Reed
   http://bsd.reedmedia.net/