Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit libpqxx for openSUSE:Factory
Hello community,

here is the log from the commit of package libpqxx for openSUSE:Factory checked
in at 2019-04-17 10:09:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpqxx (Old)
and /work/SRC/openSUSE:Factory/.libpqxx.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libpqxx"

Wed Apr 17 10:09:23 2019 rev:28 rq:694727 version:5.0.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/libpqxx/libpqxx.changes 2017-12-02
13:12:19.898742536 +0100
+++ /work/SRC/openSUSE:Factory/.libpqxx.new.17052/libpqxx.changes
2019-04-17 10:09:38.242867363 +0200
@@ -1,0 +2,12 @@
+Tue Apr 16 07:02:02 UTC 2019 - josef.moellers@xxxxxxxx
+
+- Added support for pkg-config, keeping support for pg_config
+ [libpqxx-add-pkg-config-support.patch]
+
+-------------------------------------------------------------------
+Tue Apr 16 07:01:40 UTC 2019 - josef.moellers@xxxxxxxx
+
+- Added support for python3.
+ [libpqxx-add-python3-support.patch]
+
+-------------------------------------------------------------------

New:
----
libpqxx-add-pkg-config-support.patch
libpqxx-add-python3-support.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libpqxx.spec ++++++
--- /var/tmp/diff_new_pack.Exx5IH/_old 2019-04-17 10:09:39.338868531 +0200
+++ /var/tmp/diff_new_pack.Exx5IH/_new 2019-04-17 10:09:39.342868535 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libpqxx
#
-# Copyright (c) 2017 SUSE LINUX Products 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
@@ -28,13 +28,15 @@
Url: http://pqxx.org/development/libpqxx/
Source:
https://github.com/jtv/libpqxx/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: libpqxx-sed-4.3.patch
+Patch1: libpqxx-add-python3-support.patch
+Patch2: libpqxx-add-pkg-config-support.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: postgresql-devel
# BuildRequires: python
-BuildRequires: %{pythons}
+BuildRequires: python3
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -82,6 +84,8 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
chmod 0644 COPYING
find . -name ".cvsignore" -delete


++++++ libpqxx-add-pkg-config-support.patch ++++++
Index: libpqxx-5.0.1/configure.ac
===================================================================
--- libpqxx-5.0.1.orig/configure.ac
+++ libpqxx-5.0.1/configure.ac
@@ -39,7 +39,6 @@ AC_DISABLE_SHARED
AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
AC_PATH_PROG([MKDIR], [mkdir])
-AC_PATH_PROG([PKG_CONFIG], [pkg-config])

# Documentation.
AC_ARG_ENABLE(
@@ -308,23 +307,19 @@ cpp_pragma_message=no)
AC_MSG_RESULT($cpp_pragma_message)

# Find PostgreSQL includes and libraries
+AC_PATH_PROGS(PKG_CONFIG, [pkg-config])
AC_PATH_PROGS(PG_CONFIG, pg_config)
-if test -z "$PG_CONFIG" || test ! -r "$PG_CONFIG"; then
- AC_MSG_ERROR([
-PostgreSQL configuration script pg_config not found. Make sure this is in your
-command path before configuring. Without it, the configure script has no way
to
-find the right location for the libpq library and its headers.
-])
-fi

AC_ARG_WITH(
[postgres-include],
[AS_HELP_STRING(
[--with-postgres-include=DIR],
- [Use PostgreSQL includes from DIR. Defaults to querying pg_config.])],
+ [Use PostgreSQL includes from DIR. Defaults to querying pg_config or
pkg-config, whichever is available.])],
AS_IF(
[test "x$with_postgres_include" == "xyes"],
[with_postgres_include=""]))
+
+if test -n "$PG_CONFIG" && test -r "$PG_CONFIG"; then
AS_IF(
[test -z "$with_postgres_include"],
[with_postgres_include=$($PG_CONFIG --includedir)])
@@ -332,6 +327,22 @@ AC_MSG_NOTICE([using PostgreSQL headers
AC_SUBST(with_postgres_include)
POSTGRES_INCLUDE="-I${with_postgres_include}"
AC_SUBST(POSTGRES_INCLUDE)
+elif test -n "$PKG_CONFIG" && test -r "$PKG_CONFIG"; then
+AS_IF(
+ [test -z "$with_postgres_include"],
+ [with_postgres_include=$($PKG_CONFIG libpq --cflags | sed 's/^-I//')])
+AC_MSG_NOTICE([using PostgreSQL headers at $with_postgres_include])
+AC_SUBST(with_postgres_include)
+POSTGRES_INCLUDE="-I${with_postgres_include}"
+AC_SUBST(POSTGRES_INCLUDE)
+else
+ AC_MSG_ERROR([
+Neither PostgreSQL configuration script pg_config nor pkg-config found.
+Make sure at least one of these is in your command path before configuring.
+Without either of them, the configure script has no way to find the right
+location for the libpq library and its headers.
+])
+fi

AC_ARG_WITH(
[postgres-lib],
@@ -341,13 +352,24 @@ AC_ARG_WITH(
AS_IF(
[test "x$with_postgres_lib" == "xyes"],
[with_postgres_lib=""]))
-AS_IF(
- [test -z "$with_postgres_lib"],
- [with_postgres_lib=$($PG_CONFIG --libdir)])
-AC_MSG_NOTICE([using PostgreSQL libraries at $with_postgres_lib])
-AC_SUBST(with_postgres_lib)
-#POSTGRES_LIB="-R${with_postgres_lib}"
-AC_SUBST(POSTGRES_LIB)
+if test -n "$PG_CONFIG" && test -r "$PG_CONFIG"; then
+ AS_IF(
+ [test -z "$with_postgres_lib"],
+ [with_postgres_lib=$($PG_CONFIG --libdir)])
+ AC_MSG_NOTICE([using PostgreSQL libraries at $with_postgres_lib])
+ AC_SUBST(with_postgres_lib)
+ #POSTGRES_LIB="-R${with_postgres_lib}"
+ AC_SUBST(POSTGRES_LIB)
+elif test -n "$PKG_CONFIG" && test -r "$PKG_CONFIG"; then
+ AS_IF(
+ [test -z "$with_postgres_lib"],
+ [with_postgres_lib=$($PKG_CONFIG libpq --libs-only-L | sed 's/^-L//')])
+ AC_MSG_NOTICE([using PostgreSQL libraries at $with_postgres_lib])
+ # configure insists on inserting a library search path, so give him a
standard one ...
+ AC_SUBST(with_postgres_lib, "")
+ #POSTGRES_LIB="-R${with_postgres_lib}"
+ AC_SUBST(POSTGRES_LIB)
+fi


AC_HEADER_STDC
@@ -399,7 +421,7 @@ fi
AC_CHECK_HEADER([${with_postgres_include}/libpq-fe.h],[],[AC_MSG_ERROR([
Can't find libpq-fe.h in ${with_postgres_include}. Are you sure the libpq
headers are installed correctly? They should be in the directory returned by
-"pg_config --includedir".
+"pg_config --includedir" or "pkg-config libpq --cflags".

If you do have libpq (the C-language client library for PostgreSQL) installed,
make sure you have the related development materials--mainly its header files--
@@ -414,8 +436,9 @@ AC_TRY_COMPILE([#include<${with_postgres
[],
[AC_MSG_ERROR([
Could not compile a call to a basic libpq function. There must be something
-seriously wrong with the headers that "pg_config --includedir" pointed to; the
-contents of config.log may give you a clue about the nature of the failure.
+seriously wrong with the headers that "pg_config --includedir" or "pkg-config
+libpq --cflags" pointed to; the contents of config.log may give you a clue
+about the nature of the failure.
Source including the libpq header libpq-fe.h can be compiled, but a call to the
most basic libpq function PQexec() failed to compile successfully. This is the
litmus test for a working libpq.
@@ -426,13 +449,18 @@ AC_MSG_RESULT(yes)
# tries to call main()
AC_LANG_PUSH(C)

-LDFLAGS="$LDFLAGS -L${with_postgres_lib}"
+if test "x${with_postgres_lib}" = "x"; then
+ with_postgres_libpath=""
+else
+ with_postgres_libpath="-L${with_postgres_lib}"
+fi
+LDFLAGS="$LDFLAGS ${with_postgres_libpath}"

-AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR([
+AC_CHECK_LIB(pq, main, [], [AC_MSG_ERROR([
Could not link to libpq. Make sure you have the PostgreSQL client library
installed, and that the library binary can be found in the location returned by
-"pg_config --libdir".
-])], -L${with_postgres_lib})
+"pg_config --libdir" or "pkg-config libpq --libs-only-L".
+])], ${with_postgres_libpath})

AC_CHECK_LIB([pq], [PQexec],[], [AC_MSG_ERROR([
Did not find the PQexec() function in libpq. This is the litmus test for a
@@ -448,7 +476,7 @@ radical ABI change.
The last parts of config.log may give you a clue as to what really went wrong,
but be warned that this is no easy reading. Look for the last error message
occurring in the file.
-])], -L${with_postgres_lib})
+])], ${with_postgres_libpath})

# Remove redundant occurrances of -lpq
LIBS="$(echo "$LIBS" | sed -e
's/-lpq[[[:space:]]]*[[[:space:]]]-lpq\>/-lpq/g')"
++++++ libpqxx-add-python3-support.patch ++++++
Index: libpqxx-5.0.1/tools/splitconfig
===================================================================
--- libpqxx-5.0.1.orig/tools/splitconfig
+++ libpqxx-5.0.1/tools/splitconfig
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3

"""Extract configuration items into various configuration headers.

Index: libpqxx-5.0.1/tools/template2mak.py
===================================================================
--- libpqxx-5.0.1.orig/tools/template2mak.py
+++ libpqxx-5.0.1/tools/template2mak.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
r"""
-------------------------------------------------------------------------


< Previous Next >
This Thread
  • No further messages