mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-04 00:02:52 -05:00 
			
		
		
		
	Fix PGXS support for building loadable modules on AIX.
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.
This commit is contained in:
		
							parent
							
								
									7e0cce0265
								
							
						
					
					
						commit
						3f88fa971a
					
				@ -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)
 | 
			
		||||
 | 
			
		||||
@ -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) $^ >$@
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user