diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2016-02-16 12:30:43 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2016-02-16 12:30:43 +0000 |
| commit | e7f84928fc02f3bb32cf430247b7414e21f3aa68 (patch) | |
| tree | 2cd47ac58067acb9ac81d6f0713c4006d9d01330 | |
| parent | 0094edd9b141143347d53abf7dfad6120925f217 (diff) | |
| download | ports-e7f84928fc02f3bb32cf430247b7414e21f3aa68.tar.gz ports-e7f84928fc02f3bb32cf430247b7414e21f3aa68.zip | |
- Fix build for -openssl and -imap
PR: 207244
Notes
Notes:
svn path=/head/; revision=408988
| -rw-r--r-- | lang/php70/Makefile | 2 | ||||
| -rw-r--r-- | lang/php70/files/patch-acinclude.m4 | 25 |
2 files changed, 8 insertions, 19 deletions
diff --git a/lang/php70/Makefile b/lang/php70/Makefile index aaef2f857808..c35d83b5004d 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -3,7 +3,7 @@ PORTNAME= php70 PORTVERSION= 7.0.3 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} diff --git a/lang/php70/files/patch-acinclude.m4 b/lang/php70/files/patch-acinclude.m4 index f6b369fa56c7..7bdef6d75080 100644 --- a/lang/php70/files/patch-acinclude.m4 +++ b/lang/php70/files/patch-acinclude.m4 @@ -1,5 +1,5 @@ ---- acinclude.m4.orig 2016-02-03 00:32:19.000000000 +0800 -+++ acinclude.m4 2016-02-16 15:05:51.416291000 +0800 +--- acinclude.m4.orig 2016-02-16 19:01:10.026983000 +0800 ++++ acinclude.m4 2016-02-16 19:05:00.294501000 +0800 @@ -985,15 +985,9 @@ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then dnl ---------------------------------------------- CLI static module @@ -32,28 +32,17 @@ dnl Some systems require that we link $2 to $1 when building ]) -@@ -2321,9 +2309,9 @@ - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - -@@ -2970,7 +2958,7 @@ +@@ -2970,8 +2958,7 @@ $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ +- + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ - \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj -@@ -2990,12 +2978,12 @@ + EOF +@@ -2990,12 +2977,12 @@ $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) echo "[#] Generated by Makefile for libtool" > \$[]@ @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir @@ -68,7 +57,7 @@ echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] else [\\] echo "non_pic_object='none'" >> \$[]@ [;\\] -@@ -3007,7 +2995,7 @@ +@@ -3007,7 +2994,7 @@ *) cat>>Makefile.objects<<EOF $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS) |