Hello community, here is the log from the commit of package apr-util for openSUSE:Factory checked in at 2019-03-12 09:50:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apr-util (Old) and /work/SRC/openSUSE:Factory/.apr-util.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apr-util" Tue Mar 12 09:50:11 2019 rev:8 rq:683686 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/apr-util/apr-util.changes 2018-10-01 09:06:03.991859263 +0200 +++ /work/SRC/openSUSE:Factory/.apr-util.new.28833/apr-util.changes 2019-03-12 09:50:14.519576008 +0100 @@ -1,0 +2,7 @@ +Tue Mar 5 12:42:45 UTC 2019 - Reinhard Max <[email protected]> + +- apr-util-postgresql.patch: PostrgeSQL's pg_config is meant for + linking server extensions, use libpq's pkg-config, if pg_config + is missing. This fixes build with PostgreSQL 11. + +------------------------------------------------------------------- New: ---- apr-util-postgresql.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apr-util.spec ++++++ --- /var/tmp/diff_new_pack.4yrNk1/_old 2019-03-12 09:50:15.143575884 +0100 +++ /var/tmp/diff_new_pack.4yrNk1/_new 2019-03-12 09:50:15.147575882 +0100 @@ -1,7 +1,7 @@ # # spec file for package apr-util # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -32,6 +32,8 @@ Patch2: apr-util-visibility.patch # PATCH-FIX-OPENSUSE apr-util-mariadb-10.2.patch [email protected] -- Fix build with mariadb 10.2 Patch3: apr-util-mariadb-10.2.patch +# PATCH-FIX-OPENSUSE apr-util-postgresql.patch [email protected] -- Fix build with PostgreSQL 11 +Patch4: apr-util-postgresql.patch BuildRequires: apr-devel BuildRequires: autoconf BuildRequires: db-devel @@ -111,6 +113,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %build echo 'HTML_TIMESTAMP=NO' >> docs/doxygen.conf ++++++ apr-util-postgresql.patch ++++++ --- build/dbd.m4.orig +++ build/dbd.m4 @@ -29,124 +29,48 @@ AC_DEFUN([APU_CHECK_DBD], [ old_ldflags="$LDFLAGS" AC_ARG_WITH([pgsql], APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]), - [ - if test "$withval" = "yes"; then - AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) - if test "x$PGSQL_CONFIG" != 'x'; then - pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" + [], [with_pgsql=check]) - APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) - APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) - fi + if test "x$withval" != "xno"; then + AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) - AC_CHECK_HEADERS(libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ - if test "x$PGSQL_CONFIG" != 'x'; then - unset ac_cv_lib_pq_PQsendQueryPrepared - pgsql_LIBS="`$PGSQL_CONFIG --libs`" - APR_ADDTO(LIBS, [$pgsql_LIBS]) - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) - fi - ]) - ]) - if test "$apu_have_pgsql" = "0"; then - AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ - if test "x$PGSQL_CONFIG" != 'x'; then - unset ac_cv_lib_pq_PQsendQueryPrepared - pgsql_LIBS="`$PGSQL_CONFIG --libs`" - APR_ADDTO(LIBS, [$pgsql_LIBS]) - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) - fi - ]) - ]) - fi - if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) - fi - elif test "$withval" = "no"; then - : - else - AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin]) - if test "x$PGSQL_CONFIG" != 'x'; then - pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" - else - pgsql_CPPFLAGS="-I$withval/include" - pgsql_LDFLAGS="-L$withval/lib " - fi + if test "x$PGSQL_CONFIG" != 'x'; then + pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" - APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) - APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) + else + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + if test -n "$PKG_CONFIG"; then + pgsql_CPPFLAGS="`$PKG_CONFIG libpq --cflags`" + pgsql_LDFLAGS="`$PKG_CONFIG libpq --libs`" + pgsql_LIBS="`$PKG_CONFIG libpq --libs`" - AC_MSG_NOTICE(checking for pgsql in $withval) - AC_CHECK_HEADERS(libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ - if test "x$PGSQL_CONFIG" != 'x'; then - unset ac_cv_lib_pq_PQsendQueryPrepared - pgsql_LIBS="`$PGSQL_CONFIG --libs`" - APR_ADDTO(LIBS, [$pgsql_LIBS]) - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) - fi - ]) - ]) - if test "$apu_have_pgsql" != "1"; then - AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ - if test "x$PGSQL_CONFIG" != 'x'; then - unset ac_cv_lib_pq_PQsendQueryPrepared - pgsql_LIBS="`$PGSQL_CONFIG --libs`" - APR_ADDTO(LIBS, [$pgsql_LIBS]) - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) - fi - ]) - ]) - fi - if test "$apu_have_pgsql" != "0"; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) + elif test "x$withval" != "xyes"; then + pgsql_CPPFLAGS="-I$withval/include" + pgsql_LDFLAGS="-L$withval/lib" + pgqsl_LIBS="-lpq" fi fi - ], [ - AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) - if test "x$PGSQL_CONFIG" != 'x'; then - pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" + if test -n "pgsql_CPPFLAGS"; then APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) - fi - - AC_CHECK_HEADERS(libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ - if test "x$PGSQL_CONFIG" != 'x'; then - unset ac_cv_lib_pq_PQsendQueryPrepared - pgsql_LIBS="`$PGSQL_CONFIG --libs`" - APR_ADDTO(LIBS, [$pgsql_LIBS]) + APR_ADDTO(LIBS, [$pgsql_LIBS]) + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) + AC_CHECK_HEADERS(libpq-fe.h, [ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) - fi ]) - ]) - if test "$apu_have_pgsql" = "0"; then - AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ - if test "x$PGSQL_CONFIG" != 'x'; then - unset ac_cv_lib_pq_PQsendQueryPrepared - pgsql_LIBS="`$PGSQL_CONFIG --libs`" - APR_ADDTO(LIBS, [$pgsql_LIBS]) + if test "$apu_have_pgsql" = "0"; then + AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) - fi ]) - ]) - fi - if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) + fi fi - ]) + fi AC_SUBST(apu_have_pgsql) dnl Since we have already done the AC_CHECK_LIB tests, if we have it, dnl we know the library is there. - if test "$apu_have_pgsql" = "1"; then + if test "$apu_have_pgsql" = "1" && test "x$PGSQL_CONFIG" != 'x'; then APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS -lpq $pgsql_LIBS]) fi AC_SUBST(LDADD_dbd_pgsql)
