tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: native X, linux and $(prefix)



On Mon, 09 Dec 2013 09:28:09 +0900, Mark Davies <mark%ecs.vuw.ac.nz@localhost> 
wrote:

so where is the "/pkg/" part of the prefix coming from and why isnt
this an issue on NetBSD with native X?


Following up my own post, presumably this is because with the library
actually in /usr/pkg/lib/libcairo.la and X11BASE=/usr and
LOCALBASE=/usr/pkg something is successfully matching against X11BASE
and stripping that off rather than not matching and going on to match
against LOCALBASE when transforming into the buildlink path.

Is there something I can do to get around this?

How about reorder sed script as followings?

Index: bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.223
diff -u -r1.223 bsd.buildlink3.mk
--- bsd.buildlink3.mk   8 Jun 2013 20:23:02 -0000       1.223
+++ bsd.buildlink3.mk   9 Dec 2013 02:08:59 -0000
@@ -800,13 +800,14 @@
        -e "/^libdir=/s,/usr\(/lib/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g" \
        -e 
"/^libdir=/s,${DEPOTBASE}/[^/${_BLNK_SEP}]*\(/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g"

+_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
+       -e "/^libdir=/s,${LOCALBASE}\(/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g"
+
 .    if ${X11_TYPE} != "modular"
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
        -e 
"/^libdir=/s,${X11BASE}\(/[^${_BLNK_SEP}]*\),${BUILDLINK_X11_DIR}\\1,g"
 .    endif

-_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
-       -e "/^libdir=/s,${LOCALBASE}\(/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g"
 .  endif
 .endfor



--
OBATA Akio / obache%NetBSD.org@localhost


Home | Main Index | Thread Index | Old Index