summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-13 08:16:16 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-13 08:16:16 +0000
commit7196bb6c46dbd2c028ea1becb5895f5bcff8978d (patch)
tree980b666077b962753f29921578fa3246a97d0810
parentReleasing progress-linux version 10.4-1~dschinn1. (diff)
downloadpostgresql-10-7196bb6c46dbd2c028ea1becb5895f5bcff8978d.zip
postgresql-10-7196bb6c46dbd2c028ea1becb5895f5bcff8978d.tar.xz
Merging debian version 10.4-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/libpgport-pkglibdir11
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index eb8948d..b4963af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgresql-10 (10.4-2) unstable; urgency=medium
+
+ * Update libpq_pgport in Makefile.global to find libpgcommon/libpgport in
+ pkglibdir.
+
+ -- Christoph Berg <myon@debian.org> Sat, 12 May 2018 17:57:49 +0200
+
postgresql-10 (10.4-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/libpgport-pkglibdir b/debian/patches/libpgport-pkglibdir
index eaf9361..1f67846 100644
--- a/debian/patches/libpgport-pkglibdir
+++ b/debian/patches/libpgport-pkglibdir
@@ -55,3 +55,14 @@
libpgport.a: $(OBJS)
rm -f $@
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -490,7 +490,7 @@ libpq = -L$(libpq_builddir) -lpq
+ # pgport before libpq. This does cause duplicate -lpgport's to appear
+ # on client link lines.
+ ifdef PGXS
+-libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
++libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
+ else
+ libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
+ endif