com php-src: Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17: acinclude.m4
| From: | Christopher Jones | Date: | Mon, 05 Aug 2013 21:52:12 +0000 |
| Subject: | com php-src: Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17: acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72841@lists.php.net to get a copy of this message | ||
Commit: 3c5e22921202bf5451774b23e2a25fb73029fc68
Author: Remi Collet <remi@php.net> Sun, 16 Dec 2012 08:51:17 +0100
Committer: Christopher Jones <sixd@php.net> Mon, 5 Aug 2013 14:52:12 -0700
Parents: ec4019e8f693fb68c8e282bb540812a10d99cba1
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3c5e22921202bf5451774b23e2a25fb73029fc68
Log:
Fixed bug #63706: Cannot build PHP-5..5 with --enable-dtrace on Fedora 17
Bugs:
https://bugs.php.net/63706
Changed paths:
M acinclude.m4
Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index 1c8ca19..1abdeed 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2966,12 +2966,12 @@ dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
$abs_srcdir/$ac_provsrc:;
$ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
- dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak
's,PHP_,DTRACE_,g' \$[]@
+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ &&
\$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
\$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
$ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
- dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
EOF
])