diff options
| author | tron <tron> | 2008-10-06 12:54:43 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-10-06 12:54:43 +0000 |
| commit | 4685737270ee27df49d8a26490639d8311a68d5a (patch) | |
| tree | ca921948232423405381fd6666713a953770b30d /x11 | |
| parent | 5c89e56fe3e0ab7602a6a4f8d7990fe8181e7267 (diff) | |
| download | pkgsrc-4685737270ee27df49d8a26490639d8311a68d5a.tar.gz | |
Properly enclose the Mac OS X work around in the appropriate checks.
Problem pointed out by Quentin Garnier.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/pixman/builtin.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/x11/pixman/builtin.mk b/x11/pixman/builtin.mk index a6a70f65c6d..144232e5088 100644 --- a/x11/pixman/builtin.mk +++ b/x11/pixman/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2008/10/06 11:22:09 tron Exp $ +# $NetBSD: builtin.mk,v 1.6 2008/10/06 12:54:43 tron Exp $ BUILTIN_PKG:= pixman PKGCONFIG_FILE.pixman= ${X11BASE}/lib/pkgconfig/pixman-1.pc @@ -9,6 +9,9 @@ PKGCONFIG_FILE.pixman= ${X11BASE}/lib/pkgconfig/pixman-1.pc # Work around broken libtool archive "/usr/X11/lib/libpixman-1.la" under # Mac OS 10.5.4 or newer which references a non-existing version of the # PNG shared library. -.if !empty(MACHINE_PLATFORM:MDarwin-9.*-*) +CHECK_BUILTIN.pixman?= no +.if !empty(CHECK_BUILTIN.pixman:M[nN][oO]) && \ + !empty(USE_BUILTIN.pixman:M[Yy][Ee][Ss]) && \ + !empty(MACHINE_PLATFORM:MDarwin-9.*-*) BUILDLINK_TRANSFORM+= rename:-lpixman-1.0.10.0:-lpixman-1 .endif |