diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/postgresql')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch | 50 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc | 7 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb) | 3 |
3 files changed, 3 insertions, 57 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch deleted file mode 100644 index 84cd5c157..000000000 --- a/meta-openembedded/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-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index d35711c1e..090e16f58 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/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" @@ -248,10 +247,8 @@ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ FILES_${PN}-client = "${bindir}/clusterdb \ ${bindir}/createdb \ - ${bindir}/createlang \ ${bindir}/createuser \ ${bindir}/dropdb \ - ${bindir}/droplang \ ${bindir}/dropuser \ ${bindir}/pg_dump \ ${bindir}/pg_dumpall \ @@ -311,7 +308,7 @@ FILES_libpgtypes-staticdev = "${libdir}/libpgtypes*.a" FILES_libpgtypes-dev = "${libdir}/libpgtypes*${SOLIBS} ${includedir}/pgtypes*.h" FILES_${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \ - ${bindir}/pgbench ${bindir}/vacuumlo \ + ${bindir}/pgbench \ ${S}/contrib/spi/*.example \ ${libdir}/${BPN}/_int.so ${libdir}/${BPN}/adminpack.so \ ${libdir}/${BPN}/autoinc.so ${libdir}/${BPN}/auto_explain.so \ @@ -333,7 +330,7 @@ FILES_${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \ ${libdir}/${BPN}/sslinfo.so \ ${libdir}/${BPN}/tablefunc.so \ ${libdir}/${BPN}/test_parser.so ${libdir}/${BPN}/timetravel.so \ - ${libdir}/${BPN}/tsearch2.so ${libdir}/${BPN}/uuid-ossp.so \ + ${libdir}/${BPN}/uuid-ossp.so \ ${libdir}/${BPN}/pgxml.so ${libdir}/${BPN}/passwordcheck.so \ ${libdir}/${BPN}/pg_upgrade_support.so ${libdir}/${BPN}/.so \ ${libdir}/${BPN}/unaccent.so \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb index 0613e50c7..6ea9acc00 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.4.bb @@ -8,5 +8,4 @@ SRC_URI += "\ file://0001-Improve-reproducibility.patch \ " -SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7" -SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de" +SRC_URI[sha256sum] = "bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc" |