mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-08 05:29:22 +00:00
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>
(cherry picked from commit 04dc1ffc16)
[Bug fix only update]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
5fe3defa40
commit
666cc4c332
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
+2
-2
@@ -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"
|
||||
Reference in New Issue
Block a user