Attached patch fixes a build issue with large num-cpus in postgresql
module: a .h file is generated, but one of the two .c files that
#include it doesn't depend on it in the Makefile.
Let's fix it in libreoffice-3-5 so that we don't get spurious
tinderbox failures there, as we are currently having in master.
Thanks!
--
Lionel
From f33038cf6a5f86a619a5860a4f95d337f0c87ae5 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Mon, 6 Feb 2012 15:17:20 +0100
Subject: [PATCH] fix postgresql massive-parallel build
---
postgresql/libpq-parallel-build.patch | 11 +++++++++++
postgresql/makefile.mk | 1 +
2 files changed, 12 insertions(+), 0 deletions(-)
create mode 100644 postgresql/libpq-parallel-build.patch
diff --git a/postgresql/libpq-parallel-build.patch b/postgresql/libpq-parallel-build.patch
new file mode 100644
index 0000000..237a483
--- /dev/null
+++ b/postgresql/libpq-parallel-build.patch
@@ -0,0 +1,11 @@
+diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile
misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile
+--- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2012-02-06 15:11:19.000000000 +0100
++++ misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile 2012-02-06
15:02:51.000000000 +0100
+@@ -109,6 +109,7 @@
+ libpq.rc: $(top_builddir)/src/Makefile.global
+
+ fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
++fe-misc.o: fe-misc.c $(top_builddir)/src/port/pg_config_paths.h
+
+ $(top_builddir)/src/port/pg_config_paths.h:
+ $(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 340a6a8..75c1e62 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -41,6 +41,7 @@ TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
PATCH_FILES=\
postgresql-moz-ldap.patch \
postgresql-libs-leak.patch \
+ libpq-parallel-build.patch \
$(TARFILE_NAME)-libreoffice.patch \
$(TARFILE_NAME)-autoreconf.patch
--
1.7.7.3
Context
- [PATCH] [REVIEW:3-5] postgresql module parallel build · Lionel Elie Mamane
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.