com php-src: Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten
(Bug 61268): acinclude.m4
| From: | Christopher Jones | Date: | Mon, 05 Aug 2013 21:21:06 +0000 |
| Subject: | com php-src: Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268): acinclude.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72837@lists.php.net to get a copy of this message | ||
Commit: ec4019e8f693fb68c8e282bb540812a10d99cba1
Author: Christopher Jones <sixd@php.net> Mon, 5 Aug 2013 14:21:06 -0700
Parents: cabf38af6d1013b6ea6d0c8539fc8f632da04870
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec4019e8f693fb68c8e282bb540812a10d99cba1
Log:
Add an empty make command for DTrace .d files to stop an implicit
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
Bugs:
https://bugs.php.net/61268
Changed paths:
M acinclude.m4
Diff:
diff --git a/acinclude.m4 b/acinclude.m4
index d5912ad..1c8ca19 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2959,8 +2959,12 @@ dnl DTrace objects
esac
dnl Generate Makefile.objects entries
+dnl The empty $ac_provsrc command stops an implicit circular dependency
+dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
cat>>Makefile.objects<<EOF
+$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' \$[]@