diff options
| author | jdolecek <jdolecek> | 2004-11-23 19:46:14 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2004-11-23 19:46:14 +0000 |
| commit | 2ec4ef481f32e36c186455b1558314a1a93c2ecd (patch) | |
| tree | baa7a0f5bd479f16ba7eb25f07393bab33f62b3a /graphics/php-gd | |
| parent | 18bcf3a74e2d2ccc8cee401d36070b804007d334 (diff) | |
| download | pkgsrc-2ec4ef481f32e36c186455b1558314a1a93c2ecd.tar.gz | |
graphics/gd is built against libpthread, which causes PHP crashes
when the gd.so module is loaded into non-threaded base program
(Apache 1.x or CLI/CGI PHP). Avoid this by switching back to bundled
GD. XPM stays disabled.
Bump PKGREVISION
Diffstat (limited to 'graphics/php-gd')
| -rw-r--r-- | graphics/php-gd/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index 50855cdfac7..8680cc74e3f 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,12 +1,16 @@ -# $NetBSD: Makefile,v 1.5 2004/11/14 11:42:48 adam Exp $ +# $NetBSD: Makefile,v 1.6 2004/11/23 19:46:14 jdolecek Exp $ MODNAME= gd +PKGREVISION= 1 CATEGORIES+= graphics COMMENT= PHP extension for GD graphics library USE_BUILDLINK3= YES -CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_DIR} +# XXX we use bundled GD so that extension is usable also by non-threaded +# PHP, such as CLI/CGI version or ap-php on Apache 1.x. + +CONFIGURE_ARGS+= --with-${MODNAME} CONFIGURE_ARGS+= --with-jpeg-dir=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-png-dir=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_DIR} @@ -15,6 +19,9 @@ CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf CONFIGURE_ARGS+= --enable-${MODNAME}-jis-conv CONFIGURE_ARGS+= --without-t1lib -.include "../../graphics/gd/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" |