diff options
author | jdolecek <jdolecek@pkgsrc.org> | 2005-10-16 12:06:05 +0000 |
---|---|---|
committer | jdolecek <jdolecek@pkgsrc.org> | 2005-10-16 12:06:05 +0000 |
commit | 6b9fd0250057c4f5e331a23a04c685d2a319fe29 (patch) | |
tree | f84d957d6a46623171326d08405447a607ff6d91 | |
parent | a865f2621a3c5d289bbb94cdf54c9f149e2ab841 (diff) | |
download | pkgsrc-6b9fd0250057c4f5e331a23a04c685d2a319fe29.tar.gz |
use PHP-provided regex on Solaris, PHP doesn't build with system regex
there
PR: 31047 by Gilles Dauphin
-rw-r--r-- | lang/php5/Makefile.php | 8 | ||||
-rw-r--r-- | www/php4/Makefile.php | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 2419122d358..04c431d0be9 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.9 2005/10/08 21:04:36 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.10 2005/10/16 12:06:05 jdolecek Exp $ # .include "../../lang/php5/Makefile.common" @@ -18,7 +18,13 @@ PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} + +# The Solaris system regex structures miss re_magic used by PHP build +.if ${OPSYS} != "SunOS" CONFIGURE_ARGS+= --with-regex=system +.else +CONFIGURE_ARGS+= --with-regex=php +.endif CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --without-sqlite diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 6cb642abd6e..2abe76155e6 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.26 2005/10/08 21:12:53 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.27 2005/10/16 12:06:05 jdolecek Exp $ .include "../../www/php4/Makefile.common" @@ -18,7 +18,15 @@ CONFIGURE_ARGS+= --disable-posix CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 + +.include "../../mk/bsd.prefs.mk" + +# The Solaris system regex structures miss re_magic used by PHP build +.if ${OPSYS} != "SunOS" CONFIGURE_ARGS+= --with-regex=system +.else +CONFIGURE_ARGS+= --with-regex=php +.endif CONFIGURE_ARGS+= --enable-memory-limit CONFIGURE_ARGS+= --enable-track-vars |