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

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a64bdf5)
Fix contrib/sepgsql and contrib/xml2 to always link required libraries.
author Robert Haas <rhaas@postgresql.org>
2011年8月19日 15:57:38 +0000 (11:57 -0400)
committer Robert Haas <rhaas@postgresql.org>
2011年8月19日 16:00:45 +0000 (12:00 -0400)
contrib/xml2 can get by without libxslt; the relevant features just
won't work. But if doesn't have libxml2, or if sepgsql doesn't have
libselinux, the link succeeds but the module then fails to work at load
time. To avoid that, link the require libraries unconditionally, so
that it will be clear at link-time that there is a problem.

Per discussion with Tom Lane and KaiGai Kohei.

contrib/sepgsql/Makefile patch | blob | blame | history
contrib/xml2/Makefile patch | blob | blame | history

diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile
index 7f997eee99deadc73ad59a158c86a9bdece11b75..1978ccf8c86e4f50281fb61b10af1de6062949e8 100644 (file)
--- a/contrib/sepgsql/Makefile
+++ b/contrib/sepgsql/Makefile
@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
-SHLIB_LINK += $(filter -lselinux, $(LIBS))
+SHLIB_LINK += -lselinux
REGRESS_OPTS += --launcher $(top_builddir)/contrib/sepgsql/launcher
check_selinux_environment:
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index ad325723c9917235edd7a629da1a2901c06be331..be3d018cf535abaf13a38a09483442c654dfe496 100644 (file)
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -8,7 +8,7 @@ DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
REGRESS = xml2
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
+SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
ifdef USE_PGXS
PG_CONFIG = pg_config
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /