All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Wang Mingyu" <wangmy@cn.fujitsu.com>
To: <openembedded-devel@lists.openembedded.org>
Cc: Wang Mingyu <wangmy@cn.fujitsu.com>
Subject: [oe] [meta-oe][PATCH] postgresql: 12.2 -> 12.3
Date: Wed, 3 Jun 2020 20:53:12 +0800	[thread overview]
Message-ID: <1591188793-15698-3-git-send-email-wangmy@cn.fujitsu.com> (raw)
In-Reply-To: <1591188793-15698-1-git-send-email-wangmy@cn.fujitsu.com>

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>
---
 ...Use-pkg-config-for-libxml2-detection.patch | 50 -------------------
 meta-oe/recipes-dbs/postgresql/postgresql.inc |  1 -
 ...{postgresql_12.2.bb => postgresql_12.3.bb} |  4 +-
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
 rename meta-oe/recipes-dbs/postgresql/{postgresql_12.2.bb => postgresql_12.3.bb} (63%)

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 84cd5c157..000000000
--- a/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d3ee8c8df5808b63e86f40831f2ba62cbb33d291 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 8 Aug 2018 09:18:27 +0800
-Subject: [PATCH] postgresql: Use pkg-config for libxml2 detection.
-
-Upstream-Status: Inappropriate [configuration]
-
-xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
-
-Signed-off-by: Philip Balister <philip@balister.org>
-
-update to version 10.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-Update for version 12.0
-Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
----
- configure.in | 16 ++--------------
- 1 file changed, 2 insertions(+), 14 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 6942f81..7fd3e78 100644
---- a/configure.in
-+++ b/configure.in
-@@ -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
--        -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
--      esac
--    done
--    for pgac_option in `$XML2_CONFIG --libs`; do
--      case $pgac_option in
--        -L*) LDFLAGS="$LDFLAGS $pgac_option";;
--      esac
--    done
--  fi
-+    CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`"
-+    LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS"
- fi
- 
- AC_SUBST(with_libxml)
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index d35711c1e..5b20098a7 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 \
     file://postgresql.pam \
     file://postgresql-setup \
     file://postgresql.service \
-    file://0001-Use-pkg-config-for-libxml2-detection.patch \
 "
 
 LEAD_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
similarity index 63%
rename from meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb
rename to meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb
index 0613e50c7..cc7e3ff52 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 += "\
    file://0001-Improve-reproducibility.patch \
 "
 
-SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7"
-SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de"
+SRC_URI[md5sum] = "a30c023dd7088e44d73be71af2ef404a"
+SRC_URI[sha256sum] = "94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41"
-- 
2.17.1




  parent reply	other threads:[~2020-06-03 12:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-03 12:53 [oe] [meta-networking][PATCH] opensaf: upgrade 5.19.10 -> 5.20.05 Wang Mingyu
2020-06-03 12:53 ` [oe] [meta-oe] [PATCH] dash: upgrade 0.5.10.2 -> 0.5.11 Wang Mingyu
2020-06-03 12:53 ` Wang Mingyu [this message]
2020-06-03 12:53 ` [oe] [meta-python][PATCH] python3-pycodestyle: upgrade 2.5.0 -> 2.6.0 Wang Mingyu
2020-06-05 17:24   ` Trevor Gamblin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1591188793-15698-3-git-send-email-wangmy@cn.fujitsu.com \
    --to=wangmy@cn.fujitsu.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.