[Pkg-php-commits] [php/debian-sid] dont-gitclean-in-build.patch: Don't run git-clean via buildconf

Sean Finney seanius at debian.org
Tue Feb 16 06:57:29 UTC 2010


Author: Sean Finney <seanius at debian.org>
Description: Don't run git-clean via buildconf
 Calling buildconf indirectly invokes vcsclean, which calls the gitclean-work
 target of build/build.mk, which calls among other things git clean -X -f -d,
 which in turn nukes the quilt .pc directory making life quite difficult for
 us.
 .
 This patch doesn't need to go upstream, as they likely don't want to support
 having a patch system on top of their source.
---
 debian/patches/dont-gitclean-in-build.patch |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/dont-gitclean-in-build.patch

diff --git a/debian/patches/dont-gitclean-in-build.patch b/debian/patches/dont-gitclean-in-build.patch
new file mode 100644
index 0000000..b89d065
--- /dev/null
+++ b/debian/patches/dont-gitclean-in-build.patch
@@ -0,0 +1,18 @@
+Author: Sean Finney <seanius at debian.org>
+Description: Don't run git-clean via buildconf
+ Calling buildconf indirectly invokes vcsclean, which calls the gitclean-work
+ target of build/build.mk, which calls among other things git clean -X -f -d,
+ which in turn nukes the quilt .pc directory making life quite difficult for
+ us.
+ .
+ This patch doesn't need to go upstream, as they likely don't want to support
+ having a patch system on top of their source.
+--- php.orig/build/build.mk
++++ php/build/build.mk
+@@ -76,6 +76,5 @@ gitclean-work:
+ 	@if (test ! -f '.git/info/exclude' || grep -s "git-ls-files" .git/info/exclude); then \
+ 		(echo "Rebuild .git/info/exclude" && echo '*.o' > .git/info/exclude && git svn propget svn:ignore | grep -v config.nice >> .git/info/exclude); \
+ 	fi; \
+-	git clean -X -f -d;
+ 
+ .PHONY: $(ALWAYS) snapshot
-- 
1.6.3.3




More information about the Pkg-php-commits mailing list