diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-03-10 11:56:02 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-03-10 11:56:02 +0000 |
| commit | ddada5d94b4f473aa9c8d0e03ac0c65ac85d3d94 (patch) | |
| tree | e278d39abca55cae178adecd6b920de9421f91b1 /x11 | |
| parent | 646a12baf448a6506b585de4d2ba90001245aa9b (diff) | |
| download | pkgsrc-ddada5d94b4f473aa9c8d0e03ac0c65ac85d3d94.tar.gz | |
When creating fake .pc files, first check all possible pkgconfig
directories rather than just lib/pkgconfig. Required for Red Hat
Linux support which spreads them across lib${LIBABISUFFIX} and
share directories.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xrender/builtin.mk | 5 | ||||
| -rw-r--r-- | x11/libXau/builtin.mk | 5 | ||||
| -rw-r--r-- | x11/libXdmcp/builtin.mk | 5 | ||||
| -rw-r--r-- | x11/xextproto/builtin.mk | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index dfd8cfa25fb..38db44dcfe0 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.20 2012/03/19 12:34:21 joerg Exp $ +# $NetBSD: builtin.mk,v 1.21 2014/03/10 11:56:02 jperkin Exp $ BUILTIN_PKG:= Xrender @@ -118,6 +118,9 @@ BUILDLINK_TARGETS+= Xrender-fake-pc Xrender-fake-pc: ${RUN} \ + for dir in lib lib${LIBABISUFFIX} share; do \ + ${TEST} -f ${BUILDLINK_PREFIX.Xrender}/$${dir}/pkgconfig/xrender.pc && exit; \ + done; \ src=${BUILDLINK_PREFIX.Xrender}/lib/pkgconfig/xrender.pc; \ dst=${BUILDLINK_DIR}/lib/pkgconfig/xrender.pc; \ ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ diff --git a/x11/libXau/builtin.mk b/x11/libXau/builtin.mk index 0059864cd32..99de98fc33a 100644 --- a/x11/libXau/builtin.mk +++ b/x11/libXau/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2010/12/13 07:51:45 obache Exp $ +# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $ BUILTIN_PKG:= libXau @@ -60,6 +60,9 @@ BUILDLINK_TARGETS+= xau-fake-pc xau-fake-pc: ${RUN} \ + for dir in lib lib${LIBABISUFFIX} share; do \ + ${TEST} -f ${BUILDLINK_PREFIX.libXau}/$${dir}/pkgconfig/xau.pc && exit; \ + done; \ src=${BUILDLINK_PREFIX.libXau}/lib/pkgconfig/xau.pc; \ dst=${BUILDLINK_DIR}/lib/pkgconfig/xau.pc; \ ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ diff --git a/x11/libXdmcp/builtin.mk b/x11/libXdmcp/builtin.mk index 631b8306d4b..9fbac7b12c7 100644 --- a/x11/libXdmcp/builtin.mk +++ b/x11/libXdmcp/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2010/12/13 07:51:45 obache Exp $ +# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $ BUILTIN_PKG:= libXdmcp @@ -60,6 +60,9 @@ BUILDLINK_TARGETS+= xdmcp-fake-pc xdmcp-fake-pc: ${RUN} \ + for dir in lib lib${LIBABISUFFIX} share; do \ + ${TEST} -f ${BUILDLINK_PREFIX.libXdmcp}/$${dir}/pkgconfig/xdmcp.pc && exit; \ + done; \ src=${BUILDLINK_PREFIX.libXdmcp}/lib/pkgconfig/xdmcp.pc; \ dst=${BUILDLINK_DIR}/lib/pkgconfig/xdmcp.pc; \ ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk index adcfacc9e6d..350b8e401f1 100644 --- a/x11/xextproto/builtin.mk +++ b/x11/xextproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.7 2009/05/26 21:59:58 rillig Exp $ +# $NetBSD: builtin.mk,v 1.8 2014/03/10 11:56:02 jperkin Exp $ BUILTIN_PKG:= xextproto @@ -71,6 +71,9 @@ BUILDLINK_TARGETS+= xextproto-fake-pc xextproto-fake-pc: ${RUN} \ + for dir in lib lib${LIBABISUFFIX} share; do \ + ${TEST} -f ${BUILDLINK_PREFIX.xextproto}/$${dir}/pkgconfig/xextproto.pc && exit; \ + done; \ src=${BUILDLINK_PREFIX.xextproto}/lib/pkgconfig/xextproto.pc; \ dst=${BUILDLINK_DIR}/lib/pkgconfig/xextproto.pc; \ ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ |