mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-21 13:41:20 +02:00
fad84319eb
libpq.pc and libecpg.pc refers pgcommon and pgport:
Libs.private: -L/usr/lib/llvm12/lib -lpgcommon -lpgport -lm
To be honest, I'm not entirely sure what's the best solution in this case,
but this one seems the most logical and correct. libpgcommon*.a and
libpgport*.a are not used just by interfaces (libpq, libecpg), but also
server components and some extensions.
pkgrel is bumped only in postgresql14 intentionally - this change will
affect only libpq-dev and libecpg-dev packages and these are built only
for postgresql14. However, I want to keep all postgresql aports in sync.
See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27509
85 lines
3.2 KiB
Plaintext
85 lines
3.2 KiB
Plaintext
Patch-Source: https://sources.debian.org/src/postgresql-14/14.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.
|
|
|
|
--- a/src/common/Makefile
|
|
+++ b/src/common/Makefile
|
|
@@ -68,15 +68,15 @@ all: libpgcommon.a libpgcommon_shlib.a l
|
|
|
|
# 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
|
|
@@ -35,13 +35,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
|
|
@@ -54,15 +54,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
|
|
@@ -549,8 +549,8 @@ libpq = -L$(libpq_builddir) -lpq
|
|
# on client link lines, since that also appears in $(LIBS).
|
|
# libpq_pgport_shlib is the same idea, but for use in client shared libraries.
|
|
ifdef PGXS
|
|
-libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
|
|
-libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
|
|
+libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
|
|
+libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
|
|
else
|
|
libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
|
|
libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)
|