git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e0cce0)

Fix PGXS support for building loadable modules on AIX.

author Tom Lane <tgl@sss.pgh.pa.us>

2012年10月10日 01:04:06 +0000 (21:04 -0400)

committer Tom Lane <tgl@sss.pgh.pa.us>

2012年10月10日 01:04:06 +0000 (21:04 -0400)

Building a shlib on AIX requires use of the mkldexport.sh script, but we
failed to install that, preventing its use from non-source-tree contexts.
Also, Makefile.aix had the wrong idea about where to find the installed
copy of the postgres.imp symbol file used by AIX.

Per report from John Pierce. Patch all the way back, since this has been
broken since the beginning of PGXS.

src/backend/Makefile patch | blob | blame | history

src/makefiles/Makefile.aix patch | blob | blame | history

diff --git a/src/backend/Makefile b/src/backend/Makefile

index 119f7aff89d196fcec418a92c4fd2a17e6f0a60a..5e30aab3ef4e0885ae151da6718e6f2168a5796e 100644 (file)

--- a/src/backend/Makefile

+++ b/src/backend/Makefile

@@ -235,6 +235,7 @@ else

endif

ifeq ($(MAKE_EXPORTS), true)

$(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'

+ $(INSTALL_PROGRAM) $(MKLDEXPORT) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'

endif

.PHONY: install-bin

@@ -253,6 +254,7 @@ endif

endif

ifeq ($(MAKE_EXPORTS), true)

$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'

+ $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)'

endif

@@ -262,6 +264,7 @@ uninstall:

rm -f '$(DESTDIR)$(bindir)/postgres$(X)' '$(DESTDIR)$(bindir)/postmaster'

ifeq ($(MAKE_EXPORTS), true)

rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'

+ rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'

endif

ifeq ($(PORTNAME), cygwin)

ifeq ($(MAKE_DLL), true)

diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix

index fc759ec082d1c9980ee6ba210277cde027e851e4..e5ad89d147007d4f6811e2c7f86e1a61be7dae62 100644 (file)

--- a/src/makefiles/Makefile.aix

+++ b/src/makefiles/Makefile.aix

@@ -27,12 +27,13 @@ endif

POSTGRES_IMP= postgres.imp

ifdef PGXS

-BE_DLLLIBS= -Wl,-bI:$(bindir)/postgres/$(POSTGRES_IMP)

+BE_DLLLIBS= -Wl,-bI:$(pkglibdir)/$(POSTGRES_IMP)

else

BE_DLLLIBS= -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP)

endif

-MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh

+MKLDEXPORT_DIR=src/backend/port/aix

+MKLDEXPORT=$(top_srcdir)/$(MKLDEXPORT_DIR)/mkldexport.sh

%.exp: %.o

$(MKLDEXPORT) $^ >$@

This is the main PostgreSQL git repository.