From 0e88ca24d6953107b6a66b2182ffbee5f807dbf0 Mon Sep 17 00:00:00 2001 From: Zheng Ruoqin Date: Thu, 7 Nov 2019 20:05:55 +0800 Subject: postgresql: upgrade 11.5 -> 12.0 Update 0001-Use-pkg-config-for-libxml2-detection.patch for new version. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../files/0001-Use-pkg-config-for-libxml2-detection.patch | 14 +++++++++----- meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb | 12 ------------ meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb | 12 ++++++++++++ 3 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb create mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb 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 index f14da06d91..84cd5c1579 100644 --- 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 @@ -9,21 +9,25 @@ xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. Signed-off-by: Philip Balister -upate to version 10.4 +update to version 10.4 Signed-off-by: Changqing Li + +Update for version 12.0 +Signed-off-by: Zheng Ruoqin --- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + configure.in | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in -index d9fe56e..3e2cd3a 100644 +index 6942f81..7fd3e78 100644 --- a/configure.in +++ b/configure.in -@@ -816,19 +816,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], +@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then - PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) +- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl - if test -n "$XML2_CONFIG"; then - for pgac_option in `$XML2_CONFIG --cflags`; do - case $pgac_option in diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb b/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb deleted file mode 100644 index fd4200a733..0000000000 --- a/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" -SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb new file mode 100644 index 0000000000..d5b1ebdb5e --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ +" + +SRC_URI[md5sum] = "87545416ef021eee8621d31a93fcc899" +SRC_URI[sha256sum] = "cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6" -- cgit 1.2.3-korg