diff options
author | Christopher Larson <kergoth@gmail.com> | 2013-12-13 09:08:25 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-01 22:34:35 +0100 |
commit | 30c09242db1bd7e3a1f4f479ae17eeb7aaac22f5 (patch) | |
tree | 04420cb9f78885f7eda8ed4670e4aaf573918ae1 /meta-oe/recipes-support/postgresql | |
parent | de38b56f76773e368bdcf230161f5b7ec07a451e (diff) | |
download | meta-openembedded-30c09242db1bd7e3a1f4f479ae17eeb7aaac22f5.tar.gz |
postgresql: apply upstream parallel make fix
Reported-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/postgresql')
-rw-r--r-- | meta-oe/recipes-support/postgresql/postgresql-9.2.4/ecpg-parallel-make-fix.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb | 5 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/postgresql/postgresql-9.2.4/ecpg-parallel-make-fix.patch b/meta-oe/recipes-support/postgresql/postgresql-9.2.4/ecpg-parallel-make-fix.patch new file mode 100644 index 000000000..63615cd51 --- /dev/null +++ b/meta-oe/recipes-support/postgresql/postgresql-9.2.4/ecpg-parallel-make-fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Upstream-status: backport | ||
2 | |||
3 | From 602070f9cce790debd8d1469254e7726ab499ae7 Mon Sep 17 00:00:00 2001 | ||
4 | From: Peter Eisentraut <peter_e@gmx.net> | ||
5 | Date: Fri, 29 Mar 2013 21:39:55 -0400 | ||
6 | Subject: [PATCH] ecpg: Parallel make fix | ||
7 | |||
8 | In some parallel make situations, the install-headers target could be | ||
9 | called before the installation directories are created by installdirs, | ||
10 | causing the installation to fail. Fix that by making install-headers | ||
11 | depend on installdirs. | ||
12 | --- | ||
13 | src/interfaces/ecpg/include/Makefile | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile | ||
17 | index eab833b..e92e56f 100644 | ||
18 | --- a/src/interfaces/ecpg/include/Makefile | ||
19 | +++ b/src/interfaces/ecpg/include/Makefile | ||
20 | @@ -18,7 +18,7 @@ ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h ecpg_informi | ||
21 | sqlda.h sqlda-compat.h sqlda-native.h | ||
22 | informix_headers = datetime.h decimal.h sqltypes.h | ||
23 | |||
24 | -install-headers: $(ecpg_headers) $(informix_headers) | ||
25 | +install-headers: $(ecpg_headers) $(informix_headers) installdirs | ||
26 | $(INSTALL_DATA) $(addprefix $(srcdir)/,$(ecpg_headers)) '$(DESTDIR)$(includedir)/' | ||
27 | $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(informix_esql_dir)/' | ||
28 | $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)' | ||
29 | -- | ||
30 | 1.8.3.4 | ||
31 | |||
diff --git a/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb b/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb index 59665daf1..49ca53fae 100644 --- a/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb +++ b/meta-oe/recipes-support/postgresql/postgresql_9.2.4.bb | |||
@@ -4,7 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ab55a5887d3f8ba77d0fd7db787e4bab" | |||
4 | 4 | ||
5 | PR = "${INC_PR}.0" | 5 | PR = "${INC_PR}.0" |
6 | 6 | ||
7 | SRC_URI += "file://remove.autoconf.version.check.patch" | 7 | SRC_URI += "\ |
8 | file://remove.autoconf.version.check.patch \ | ||
9 | file://ecpg-parallel-make-fix.patch \ | ||
10 | " | ||
8 | 11 | ||
9 | SRC_URI[md5sum] = "6ee5bb53b97da7c6ad9cb0825d3300dd" | 12 | SRC_URI[md5sum] = "6ee5bb53b97da7c6ad9cb0825d3300dd" |
10 | SRC_URI[sha256sum] = "d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93" | 13 | SRC_URI[sha256sum] = "d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93" |