From 903c7eec0925a616fc17d0579e625af7a1ad849d Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 23 Dec 2002 02:06:07 +0000 Subject: Create a dummy libtool archive if we use the built-in freetype2 library from the XFree86 distribution. This avoids problems with libtool finding libfreetype.la if graphics/freetype2 is installed as well. This addresses PR 19496 by Bill Sommerfeld and reported independently by Steve Bellovin on the netbsd-users mailing list. --- graphics/freetype2/buildlink2.mk | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'graphics') diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk index d642ceac90a..b1c4ad18ce2 100644 --- a/graphics/freetype2/buildlink2.mk +++ b/graphics/freetype2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2002/10/19 19:05:39 heinz Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2002/12/23 02:06:07 jlam Exp $ .if !defined(FREETYPE2_BUILDLINK2_MK) FREETYPE2_BUILDLINK2_MK= # defined @@ -70,12 +70,20 @@ BUILDLINK_FILES.freetype2+= lib/libfreetype.* BUILDLINK_TARGETS+= freetype2-buildlink BUILDLINK_TARGETS+= freetype2-buildlink-config +BUILDLINK_TARGETS+= freetype2-libfreetype-la _FREETYPE2_CONFIG= \ ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config _FREETYPE2_BUILDLINK_CONFIG= \ ${BUILDLINK_DIR}/bin/freetype-config +.if ${_NEED_FREETYPE2} == "NO" +_BLNK_FREETYPE2_LDFLAGS= -L${BUILDLINK_PREFIX.freetype2}/lib -lfreetype +LIBTOOL_ARCHIVE_UNTRANSFORM_SED+= \ + -e "s|${BUILDLINK_PREFIX.freetype2}/lib/libfreetype.la|${_BLNK_FREETYPE2_LDFLAGS}|g" \ + -e "s|${LOCALBASE}/lib/libfreetype.la|${_BLNK_FREETYPE2_LDFLAGS}|g" +.endif + freetype2-buildlink: _BUILDLINK_USE freetype2-buildlink-config: @@ -92,4 +100,10 @@ freetype2-buildlink-config: ${CHMOD} +x ${_FREETYPE2_BUILDLINK_CONFIG}; \ fi +freetype2-libfreetype-la: + ${_PKG_SILENT}${_PKG_DEBUG} \ + lafile="${BUILDLINK_DIR}/lib/libfreetype.la"; \ + libpattern="${BUILDLINK_PREFIX.freetype2}/lib/libfreetype.*"; \ + ${BUILDLINK_FAKE_LA} + .endif # FREETYPE2_BUILDLINK2_MK -- cgit v1.2.3