summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-06-03 20:53:12 +0800
committerKhem Raj <raj.khem@gmail.com>2020-06-05 18:42:45 -0700
commit04dc1ffc16eaa2eca6299341b2a86e56b9e98367 (patch)
tree23979f3d1da9c4728a41e05a3c2f0c15ca72111b
parenteed981879ae4891db2cfcbf2586347fb177bf928 (diff)
downloadmeta-openembedded-04dc1ffc16eaa2eca6299341b2a86e56b9e98367.tar.gz
postgresql: 12.2 -> 12.3
0001-Use-pkg-config-for-libxml2-detection.patch removed since it is not available in 12.3 Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch50
-rw-r--r--meta-oe/recipes-dbs/postgresql/postgresql.inc1
-rw-r--r--meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb (renamed from meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb)4
3 files changed, 2 insertions, 53 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
deleted file mode 100644
index 84cd5c1579..0000000000
--- a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From d3ee8c8df5808b63e86f40831f2ba62cbb33d291 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 8 Aug 2018 09:18:27 +0800
4Subject: [PATCH] postgresql: Use pkg-config for libxml2 detection.
5
6Upstream-Status: Inappropriate [configuration]
7
8xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
9
10Signed-off-by: Philip Balister <philip@balister.org>
11
12update to version 10.4
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14
15Update for version 12.0
16Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
17---
18 configure.in | 16 ++--------------
19 1 file changed, 2 insertions(+), 14 deletions(-)
20
21diff --git a/configure.in b/configure.in
22index 6942f81..7fd3e78 100644
23--- a/configure.in
24+++ b/configure.in
25@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support],
26 [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])])
27
28 if test "$with_libxml" = yes ; then
29- PGAC_PATH_PROGS(XML2_CONFIG, xml2-config)
30- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl
31- if test -n "$XML2_CONFIG"; then
32- for pgac_option in `$XML2_CONFIG --cflags`; do
33- case $pgac_option in
34- -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
35- esac
36- done
37- for pgac_option in `$XML2_CONFIG --libs`; do
38- case $pgac_option in
39- -L*) LDFLAGS="$LDFLAGS $pgac_option";;
40- esac
41- done
42- fi
43+ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`"
44+ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS"
45 fi
46
47 AC_SUBST(with_libxml)
48--
492.7.4
50
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index d35711c1e5..5b20098a72 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -29,7 +29,6 @@ SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \
29 file://postgresql.pam \ 29 file://postgresql.pam \
30 file://postgresql-setup \ 30 file://postgresql-setup \
31 file://postgresql.service \ 31 file://postgresql.service \
32 file://0001-Use-pkg-config-for-libxml2-detection.patch \
33" 32"
34 33
35LEAD_SONAME = "libpq.so" 34LEAD_SONAME = "libpq.so"
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb
index 0613e50c72..cc7e3ff52b 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb
@@ -8,5 +8,5 @@ SRC_URI += "\
8 file://0001-Improve-reproducibility.patch \ 8 file://0001-Improve-reproducibility.patch \
9" 9"
10 10
11SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7" 11SRC_URI[md5sum] = "a30c023dd7088e44d73be71af2ef404a"
12SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de" 12SRC_URI[sha256sum] = "94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41"