diff options
| author | jperkin <jperkin> | 2014-03-10 11:05:51 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-03-10 11:05:51 +0000 |
| commit | 115613a04b317956d1f1706f1fac2dd22fc18658 (patch) | |
| tree | 842226eaba0a8d204fd142a4a182ecce1c141be2 /x11/libXext | |
| parent | 8b115c5aa9b7ed10b52db8e6c08d142f4c6e6416 (diff) | |
| download | pkgsrc-115613a04b317956d1f1706f1fac2dd22fc18658.tar.gz | |
Search for pkgconfig files in lib${LIBABISUFFIX} and share directories
as appropriate. This is required for X11_TYPE=native on Red Hat Linux.
Diffstat (limited to 'x11/libXext')
| -rw-r--r-- | x11/libXext/buildlink3.mk | 6 | ||||
| -rw-r--r-- | x11/libXext/builtin.mk | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk index 316e7130099..b874cbe0b91 100644 --- a/x11/libXext/buildlink3.mk +++ b/x11/libXext/buildlink3.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2012/10/23 10:11:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2014/03/10 11:05:52 jperkin Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/pkgconfig/xext.pc) +.if ${X11_TYPE} != "modular" && \ + !exists(${X11BASE}/lib/pkgconfig/xext.pc) && \ + !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xext.pc) .include "../../mk/x11.buildlink3.mk" .else diff --git a/x11/libXext/builtin.mk b/x11/libXext/builtin.mk index ebe607c5c6b..ef665f86958 100644 --- a/x11/libXext/builtin.mk +++ b/x11/libXext/builtin.mk @@ -1,7 +1,8 @@ -# $NetBSD: builtin.mk,v 1.4 2008/10/06 18:59:33 tron Exp $ +# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ BUILTIN_PKG:= libXext -PKGCONFIG_FILE.libXext= ${X11BASE}/lib/pkgconfig/xext.pc +PKGCONFIG_FILE.libXext= ${X11BASE}/lib/pkgconfig/xext.pc +PKGCONFIG_FILE.libXext+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xext.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" .include "../../mk/x11.builtin.mk" |