File tree Expand file tree Collapse file tree 4 files changed +20
-4
lines changed Expand file tree Collapse file tree 4 files changed +20
-4
lines changed Original file line number Diff line number Diff line change @@ -23,10 +23,15 @@ include $(top_builddir)/src/Makefile.global
2323include $(top_srcdir ) /contrib/contrib-global.mk
2424endif
2525
26+ # In configurations that forbid undefined symbols in libraries, link with each
27+ # dependency. This does preclude pgxs builds.
28+ ifeq ($(PORTNAME ) , aix)
29+ rpathdir = $(pkglibdir ) :$(perl_archlibexp ) /CORE
30+ SHLIB_LINK += ../hstore/libhstore.exp $(perl_embed_ldflags )
31+ endif
2632ifeq ($(PORTNAME ) , win32)
2733# these settings are the same as for plperl
2834override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
29- # This means we need an in-tree build on Windows, not a pgxs build
3035SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl* .a)
3136endif
3237
Original file line number Diff line number Diff line change @@ -23,8 +23,13 @@ include $(top_builddir)/src/Makefile.global
2323include $(top_srcdir ) /contrib/contrib-global.mk
2424endif
2525
26+ # In configurations that forbid undefined symbols in libraries, link with each
27+ # dependency. This does preclude pgxs builds.
28+ ifeq ($(PORTNAME ) , aix)
29+ rpathdir = $(pkglibdir ) :$(python_libdir )
30+ SHLIB_LINK += ../hstore/libhstore.exp $(python_libspec ) $(python_additional_libs ) $(wildcard ../../src/pl/plpython/libplpython* .exp)
31+ endif
2632ifeq ($(PORTNAME ) , win32)
27- # This means we need an in-tree build on Windows, not a pgxs build
2833SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython* .a) $(wildcard ../../src/pl/plpython/libplpython* .a)
2934endif
3035
Original file line number Diff line number Diff line change @@ -23,8 +23,13 @@ include $(top_builddir)/src/Makefile.global
2323include $(top_srcdir ) /contrib/contrib-global.mk
2424endif
2525
26+ # In configurations that forbid undefined symbols in libraries, link with each
27+ # dependency. This does preclude pgxs builds.
28+ ifeq ($(PORTNAME ) , aix)
29+ rpathdir = $(pkglibdir ) :$(python_libdir )
30+ SHLIB_LINK += $(python_libspec ) $(python_additional_libs ) $(wildcard ../../src/pl/plpython/libplpython* .exp)
31+ endif
2632ifeq ($(PORTNAME ) , win32)
27- # This means we need an in-tree build on Windows, not a pgxs build
2833SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython* .a) $(wildcard ../../src/pl/plpython/libplpython* .a)
2934endif
3035
Original file line number Diff line number Diff line change @@ -111,6 +111,7 @@ ifeq ($(PORTNAME), aix)
111111 shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
112112 endif
113113 haslibarule = yes
114+ # $(exports_file) is also usable as an import file
114115 exports_file = lib$(NAME).exp
115116endif
116117
@@ -341,7 +342,7 @@ $(shlib) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
341342 rm -f $(stlib)
342343 $(LINK.static) $(stlib) $^
343344 $(RANLIB) $(stlib)
344- $(MKLDEXPORT) $(stlib) >$(exports_file)
345+ $(MKLDEXPORT) $(stlib) $(shlib) >$(exports_file)
345346 $(COMPILER) -o $(shlib) $(stlib) -Wl,-bE:$(exports_file) $(LDFLAGS) $(LDFLAGS_SL) $(SHLIB_LINK)
346347 rm -f $(stlib)
347348 $(AR) $(AROPT) $(stlib) $(shlib)
You can’t perform that action at this time.
0 commit comments