Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitacd73ad

Browse files
committed
Code review for avoidance of direct cross-module links.
Remove $(pkglibdir) from $(rpathdir), since commitsd51924b andeda0488 removed direct linkage toobjects stored there. Users are unlikely to notice the difference.Accompany every $(python_libspec) with $(python_additional_libs); thisdoesn't fix a demonstrated bug, but it might do so on rare Pythonconfigurations. With these changes, AIX ceases to be a special case.
1 parent53dd2da commitacd73ad

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

‎contrib/hstore_plperl/Makefile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libperl explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir =$(pkglibdir):$(perl_archlibexp)/CORE
29-
SHLIB_LINK +=$(perl_embed_ldflags)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# these settings are the same as for plperl
3329
overrideCPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
@@ -37,7 +33,6 @@ else
3733
rpathdir =$(perl_archlibexp)/CORE
3834
SHLIB_LINK +=$(perl_embed_ldflags)
3935
endif
40-
endif
4136

4237
# As with plperl we need to make sure that the CORE directory is included
4338
# last, probably because it sometimes contains some header files with names

‎contrib/hstore_plpython/Makefile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libpython explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir =$(pkglibdir):$(python_libdir)
29-
SHLIB_LINK +=$(python_libspec)$(python_additional_libs)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# ... see silliness in plpython Makefile ...
3329
SHLIB_LINK +=$(sort$(wildcard ../../src/pl/plpython/libpython*.a))
3430
else
3531
rpathdir =$(python_libdir)
36-
SHLIB_LINK +=$(python_libspec)
37-
endif
32+
SHLIB_LINK +=$(python_libspec)$(python_additional_libs)
3833
endif
3934

4035
REGRESS_OPTS += --load-extension=hstore

‎contrib/ltree_plpython/Makefile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk
2424
endif
2525

2626
# We must link libpython explicitly
27-
ifeq ($(PORTNAME), aix)
28-
rpathdir =$(pkglibdir):$(python_libdir)
29-
SHLIB_LINK +=$(python_libspec)$(python_additional_libs)
30-
else
3127
ifeq ($(PORTNAME), win32)
3228
# ... see silliness in plpython Makefile ...
3329
SHLIB_LINK +=$(sort$(wildcard ../../src/pl/plpython/libpython*.a))
3430
else
3531
rpathdir =$(python_libdir)
36-
SHLIB_LINK +=$(python_libspec)
37-
endif
32+
SHLIB_LINK +=$(python_libspec)$(python_additional_libs)
3833
endif
3934

4035
REGRESS_OPTS += --load-extension=ltree

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp