[Pkg-php-commits] [php/debian-sid] Fix for parallel FTBFS in #584348
Sean Finney
seanius at seanius.net
Wed Jun 9 19:06:03 UTC 2010
---
.../patches/install-programs_parallel_FTBFS.patch | 16 ++++++++++++++++
debian/patches/series | 1 +
2 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 debian/patches/install-programs_parallel_FTBFS.patch
diff --git a/debian/patches/install-programs_parallel_FTBFS.patch b/debian/patches/install-programs_parallel_FTBFS.patch
new file mode 100644
index 0000000..4ff8e93
--- /dev/null
+++ b/debian/patches/install-programs_parallel_FTBFS.patch
@@ -0,0 +1,16 @@
+Description: Explicitly create a directory to avoid FTBFS with parallel builds
+
+Origin: vendor
+Forwarded: yes
+Bug: http://bugs.php.net/bug.php?id=52037
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584348
+--- php.orig/scripts/Makefile.frag
++++ php/scripts/Makefile.frag
+@@ -33,6 +33,7 @@ install-build:
+
+ install-programs: $(builddir)/phpize $(builddir)/php-config
+ @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/"
++ @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+ @for prog in $(bin_SCRIPTS); do \
+ echo " program: $(program_prefix)$${prog}$(program_suffix)"; \
+ $(INSTALL) -m 755 $(builddir)/$${prog} $(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
diff --git a/debian/patches/series b/debian/patches/series
index 6681d95..9b61d4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -68,3 +68,4 @@ upstream/mssql_per_query_timeout.patch
upstream/incorrect_docroot_eval.patch
upstream/soap_mem_leak.patch
upstream/incorrect_SplFileInfo_fscanf_prototype.patch
+install-programs_parallel_FTBFS.patch
--
1.6.5
More information about the Pkg-php-commits
mailing list