svn commit: r408980 - in head/lang/php70: . files
Martin Wilke
miwi at FreeBSD.org
Tue Feb 16 07:21:15 UTC 2016
Author: miwi
Date: Tue Feb 16 07:21:13 2016
New Revision: 408980
URL: https://svnweb.freebsd.org/changeset/ports/408980
Log:
- Fix build with dtrace enabled [1]
- Cleanup some old leftovers
PR: 207231 [1]
Added:
head/lang/php70/files/patch-acinclude.m4
- copied, changed from r408977, head/lang/php56/files/patch-acinclude.m4
Modified:
head/lang/php70/Makefile
Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile Tue Feb 16 07:00:07 2016 (r408979)
+++ head/lang/php70/Makefile Tue Feb 16 07:21:13 2016 (r408980)
@@ -3,7 +3,7 @@
PORTNAME= php70
PORTVERSION= 7.0.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}
@@ -60,10 +60,6 @@ DESTDIRNAME= INSTALL_ROOT
.include <bsd.port.pre.mk>
-PATCH_DIST_STRIP= -p1
-
-PATCH_SITES+= LOCAL/ale
-
.if ${PORT_OPTIONS:MCLI}
PHP_SAPI+= cli
.else
Copied and modified: head/lang/php70/files/patch-acinclude.m4 (from r408977, head/lang/php56/files/patch-acinclude.m4)
==============================================================================
--- head/lang/php56/files/patch-acinclude.m4 Tue Feb 16 06:02:24 2016 (r408977, copy source)
+++ head/lang/php70/files/patch-acinclude.m4 Tue Feb 16 07:21:13 2016 (r408980)
@@ -1,24 +1,25 @@
---- acinclude.m4.orig 2014-11-12 13:52:21.000000000 +0000
-+++ acinclude.m4 2014-11-27 09:38:09.811146437 +0000
-@@ -984,15 +984,9 @@
+--- acinclude.m4.orig 2016-02-03 00:32:19.000000000 +0800
++++ acinclude.m4 2016-02-16 15:05:51.416291000 +0800
+@@ -985,15 +985,9 @@
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- case "$PHP_SAPI" in
- cgi|embed[)]
-- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
-- EXT_STATIC="$EXT_STATIC $1"
+- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
+- EXT_STATIC="$EXT_STATIC $1;$ext_dir"
- ;;
- *[)]
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
- ;;
- esac
-+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
- EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
++
++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
+ EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1042,12 +1036,6 @@
+@@ -1043,12 +1037,6 @@
build to be successful.
])
fi
@@ -31,19 +32,19 @@
dnl Some systems require that we link $2 to $1 when building
])
-@@ -2320,9 +2308,9 @@
+@@ -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" && 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" && test "$PHP_IMAP_SSL" != "no"; then
++ elif test -n "$PHP_IMAP_SSL" != "no"; then
PHP_OPENSSL_DIR=$PHP_IMAP_SSL
fi
-@@ -2969,7 +2957,7 @@
+@@ -2970,7 +2958,7 @@
$abs_srcdir/$ac_provsrc:;
$ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
@@ -52,7 +53,7 @@
\$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
-@@ -2989,12 +2977,12 @@
+@@ -2990,12 +2978,12 @@
$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
echo "[#] Generated by Makefile for libtool" > \$[]@
@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
@@ -67,7 +68,7 @@
echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
else [\\]
echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -3006,7 +2994,7 @@
+@@ -3007,7 +2995,7 @@
*)
cat>>Makefile.objects<<EOF
$ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
More information about the svn-ports-all
mailing list