mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-06 17:24:15 +02:00
d69ead2c87
It cannot be built against older libpq, so we have to build it as the
default version right away.
ld: ../../../src/fe_utils/libpgfeutils.a(connect_utils.o): in function `disconnectDatabase':
connect_utils.c:(.text+0x35d): undefined reference to `PQcancelCreate'
ld: connect_utils.c:(.text+0x369): undefined reference to `PQcancelBlocking'
ld: connect_utils.c:(.text+0x372): undefined reference to `PQcancelFinish'
Co-Authored-By: Jakub Jirutka <jakub@jirutka.cz>
83 lines
3 KiB
Text
83 lines
3 KiB
Text
Patch-Source: https://sources.debian.org/data/main/p/postgresql-17/17.0-1/debian/patches/libpgport-pkglibdir
|
|
Author: Christoph Berg <myon@debian.org>
|
|
Description: Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir
|
|
This allows client applications to link to version-specific libraries.
|
|
Used by pg-checksums.
|
|
Forwarded: No, (somewhat) Debian specific
|
|
|
|
--- a/src/common/Makefile
|
|
+++ b/src/common/Makefile
|
|
@@ -125,15 +125,15 @@ distprep: kwlist_d.h
|
|
|
|
# libpgcommon is needed by some contrib
|
|
install: all installdirs
|
|
- $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
|
|
- $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
|
|
+ $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
|
|
+ $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
|
|
|
|
installdirs:
|
|
- $(MKDIR_P) '$(DESTDIR)$(libdir)'
|
|
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
|
|
|
|
uninstall:
|
|
- rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
|
|
- rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
|
|
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
|
|
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
|
|
|
|
libpgcommon.a: $(OBJS_FRONTEND)
|
|
rm -f $@
|
|
--- a/src/fe_utils/Makefile
|
|
+++ b/src/fe_utils/Makefile
|
|
@@ -50,13 +50,13 @@ distprep: psqlscan.c
|
|
|
|
# libpgfeutils could be useful to contrib, so install it
|
|
install: all installdirs
|
|
- $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
|
|
+ $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
|
|
|
|
installdirs:
|
|
- $(MKDIR_P) '$(DESTDIR)$(libdir)'
|
|
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
|
|
|
|
uninstall:
|
|
- rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
|
|
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
|
|
|
|
clean distclean:
|
|
rm -f libpgfeutils.a $(OBJS) lex.backup
|
|
--- a/src/port/Makefile
|
|
+++ b/src/port/Makefile
|
|
@@ -69,15 +69,15 @@ all: libpgport.a libpgport_shlib.a libpg
|
|
|
|
# libpgport is needed by some contrib
|
|
install: all installdirs
|
|
- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
|
|
- $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a'
|
|
+ $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
|
|
+ $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
|
|
|
|
installdirs:
|
|
- $(MKDIR_P) '$(DESTDIR)$(libdir)'
|
|
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
|
|
|
|
uninstall:
|
|
- rm -f '$(DESTDIR)$(libdir)/libpgport.a'
|
|
- rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
|
|
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
|
|
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
|
|
|
|
libpgport.a: $(OBJS)
|
|
rm -f $@
|
|
--- a/src/Makefile.global.in
|
|
+++ b/src/Makefile.global.in
|
|
@@ -607,7 +607,7 @@ libpq_pgport = $(libpq)
|
|
# done if they don't, since they will have satisfied all their references
|
|
# from these libraries.)
|
|
ifdef PGXS
|
|
-libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
|
|
+libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
|
|
else
|
|
libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)
|
|
endif
|