diff options
| author | adam <adam@pkgsrc.org> | 2016-12-06 08:53:48 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2016-12-06 08:53:48 +0000 |
| commit | 173e5477679a1ee2bcc2b803b9ded8ec2ce18890 (patch) | |
| tree | 484a7d32d2e1e0c7883dc3417a24680ed1b6889f /lang/php70 | |
| parent | de69f55bd965e0d8adf82c16f26bdcd0c6b22b05 (diff) | |
| download | pkgsrc-173e5477679a1ee2bcc2b803b9ded8ec2ce18890.tar.gz | |
On Darwin, allow native iconv when Command Line Tools are not installed.
Diffstat (limited to 'lang/php70')
| -rw-r--r-- | lang/php70/distinfo | 4 | ||||
| -rw-r--r-- | lang/php70/patches/patch-acinclude.m4 | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo index 23e71cb2e6a..5bd8c8a6087 100644 --- a/lang/php70/distinfo +++ b/lang/php70/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.21 2016/11/12 15:38:29 taca Exp $ +$NetBSD: distinfo,v 1.22 2016/12/06 08:53:48 adam Exp $ SHA1 (php-7.0.13.tar.bz2) = eb81c83dc4aa711926c870b4bf2f4e6ebc8ffbbb RMD160 (php-7.0.13.tar.bz2) = 9f6402077a57d33a99aeb3766fcfc42c25b8c88f SHA512 (php-7.0.13.tar.bz2) = 53276fbd35855b9337120fd74f6932e70822b8e5508b6bed068a78805049d36960300e781ec5640f4a90f2d4a09e506084a865341d151bc5c87b7777cb5ff6a3 Size (php-7.0.13.tar.bz2) = 15239442 bytes -SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad +SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56 SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 diff --git a/lang/php70/patches/patch-acinclude.m4 b/lang/php70/patches/patch-acinclude.m4 index 1f7d12bc377..b8e0cc6bd76 100644 --- a/lang/php70/patches/patch-acinclude.m4 +++ b/lang/php70/patches/patch-acinclude.m4 @@ -1,8 +1,10 @@ -$NetBSD: patch-acinclude.m4,v 1.1 2015/12/06 15:17:31 taca Exp $ +$NetBSD: patch-acinclude.m4,v 1.2 2016/12/06 08:53:48 adam Exp $ ---- acinclude.m4.orig 2015-06-23 17:33:33.000000000 +0000 +On Darwin, allow native iconv when Command Line Tools are not installed. + +--- acinclude.m4.orig 2016-11-09 01:22:57.000000000 +0000 +++ acinclude.m4 -@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ +@@ -2355,7 +2355,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -11,3 +13,19 @@ $NetBSD: patch-acinclude.m4,v 1.1 2015/12/06 15:17:31 taca Exp $ fi for i in $PHP_OPENSSL_DIR; do +@@ -2489,7 +2489,15 @@ AC_DEFUN([PHP_SETUP_ICONV], [ + done + + if test -z "$ICONV_DIR"; then ++ case $host_alias in ++ *darwin*) ++ ICONV_DIR=/usr ++ iconv_lib_name=iconv ++ ;; ++ *) + AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) ++ ;; ++ esac + fi + + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || |