From e62c0fe19b113d42db5e0f80fa7cbb82f2f88190 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Fri, 18 Dec 2015 07:44:45 -0500 Subject: build: export minimum symbols from xlators for correct resolution Revisiting http://review.gluster.org/#/c/11814/, which unintentionally introduced warnings from libtool about the xlator .so names. According to [1], the -module option must appear in the Makefile.am file(s); if -module is defined in a macro, e.g. in configure(.ac), then libtool will not recognize that this is a module and will emit a warning. [1] http://www.gnu.org/software/automake/manual/automake.html#Libtool-Modules Change-Id: Ifa5f9327d18d139597791c305aa10cc4410fb078 BUG: 1248669 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/13003 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: soumya k Reviewed-by: Niels de Vos --- xlators/features/arbiter/src/Makefile.am | 2 +- xlators/features/barrier/src/Makefile.am | 2 +- xlators/features/bit-rot/src/bitd/Makefile.am | 2 +- xlators/features/bit-rot/src/stub/Makefile.am | 2 +- xlators/features/changelog/src/Makefile.am | 2 +- xlators/features/changetimerecorder/src/Makefile.am | 2 +- xlators/features/compress/src/Makefile.am | 2 +- xlators/features/filter/src/Makefile.am | 2 +- xlators/features/ganesha/src/Makefile.am | 2 +- xlators/features/gfid-access/src/Makefile.am | 2 +- xlators/features/index/src/Makefile.am | 2 +- xlators/features/locks/src/Makefile.am | 2 +- xlators/features/mac-compat/src/Makefile.am | 2 +- xlators/features/marker/src/Makefile.am | 2 +- xlators/features/path-convertor/src/Makefile.am | 2 +- xlators/features/protect/src/Makefile.am | 6 +++--- xlators/features/quiesce/src/Makefile.am | 2 +- xlators/features/quota/src/Makefile.am | 2 +- xlators/features/read-only/src/Makefile.am | 4 ++-- xlators/features/shard/src/Makefile.am | 2 +- xlators/features/snapview-client/src/Makefile.am | 2 +- xlators/features/snapview-server/src/Makefile.am | 2 +- xlators/features/trash/src/Makefile.am | 2 +- xlators/features/upcall/src/Makefile.am | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/arbiter/src/Makefile.am b/xlators/features/arbiter/src/Makefile.am index 328e08cda9c..dd262c3d6dc 100644 --- a/xlators/features/arbiter/src/Makefile.am +++ b/xlators/features/arbiter/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = arbiter.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -arbiter_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +arbiter_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) arbiter_la_SOURCES = arbiter.c arbiter_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/barrier/src/Makefile.am b/xlators/features/barrier/src/Makefile.am index 162c6a8865c..4e909c8aad8 100644 --- a/xlators/features/barrier/src/Makefile.am +++ b/xlators/features/barrier/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = barrier.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -barrier_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +barrier_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) barrier_la_SOURCES = barrier.c diff --git a/xlators/features/bit-rot/src/bitd/Makefile.am b/xlators/features/bit-rot/src/bitd/Makefile.am index b338d3cdd8f..6557943ac69 100644 --- a/xlators/features/bit-rot/src/bitd/Makefile.am +++ b/xlators/features/bit-rot/src/bitd/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = bit-rot.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -bit_rot_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +bit_rot_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/rpc/xdr/src/ \ diff --git a/xlators/features/bit-rot/src/stub/Makefile.am b/xlators/features/bit-rot/src/stub/Makefile.am index 1746344f1b0..7e4b6837eec 100644 --- a/xlators/features/bit-rot/src/stub/Makefile.am +++ b/xlators/features/bit-rot/src/stub/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = bitrot-stub.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -bitrot_stub_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +bitrot_stub_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) bitrot_stub_la_SOURCES = bit-rot-stub-helpers.c bit-rot-stub.c bitrot_stub_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am index e851cc7819a..27af7a5ebd3 100644 --- a/xlators/features/changelog/src/Makefile.am +++ b/xlators/features/changelog/src/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \ changelog-rpc-common.h changelog-rpc.h changelog-ev-handle.h \ changelog-messages.h -changelog_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +changelog_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \ changelog-encoders.c changelog-rpc.c changelog-barrier.c \ diff --git a/xlators/features/changetimerecorder/src/Makefile.am b/xlators/features/changetimerecorder/src/Makefile.am index 5af50983fef..44cebd6aedf 100644 --- a/xlators/features/changetimerecorder/src/Makefile.am +++ b/xlators/features/changetimerecorder/src/Makefile.am @@ -5,7 +5,7 @@ if BUILD_GFDB xlator_LTLIBRARIES = changetimerecorder.la endif -changetimerecorder_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +changetimerecorder_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) changetimerecorder_la_SOURCES = changetimerecorder.c ctr-helper.c ctr-xlator-ctx.c diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am index 1c4c80eec90..b7c75e91b92 100644 --- a/xlators/features/compress/src/Makefile.am +++ b/xlators/features/compress/src/Makefile.am @@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features noinst_HEADERS = cdc.h cdc-mem-types.h -cdc_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +cdc_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) cdc_la_SOURCES = cdc.c cdc-helper.c cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(ZLIB_LIBS) diff --git a/xlators/features/filter/src/Makefile.am b/xlators/features/filter/src/Makefile.am index 49ea3a45fb7..5bdc711ae07 100644 --- a/xlators/features/filter/src/Makefile.am +++ b/xlators/features/filter/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = filter.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features -filter_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +filter_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) filter_la_SOURCES = filter.c filter_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am index 3a245703eb1..3bf291b92c6 100644 --- a/xlators/features/ganesha/src/Makefile.am +++ b/xlators/features/ganesha/src/Makefile.am @@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features noinst_HEADERS = ganesha.h ganesha-mem-types.h -ganesha_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +ganesha_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) ganesha_la_SOURCES = ganesha.c diff --git a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am index ba95c7c0184..3b25f099123 100644 --- a/xlators/features/gfid-access/src/Makefile.am +++ b/xlators/features/gfid-access/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = gfid-access.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -gfid_access_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +gfid_access_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) gfid_access_la_SOURCES = gfid-access.c gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am index a19026c6f94..2f94a8c6273 100644 --- a/xlators/features/index/src/Makefile.am +++ b/xlators/features/index/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = index.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -index_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +index_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) index_la_SOURCES = index.c index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am index e486e32fa1e..8e67bebbfa4 100644 --- a/xlators/features/locks/src/Makefile.am +++ b/xlators/features/locks/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = locks.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -locks_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +locks_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ clear.c diff --git a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am index c178a2542e8..1a312991f6b 100644 --- a/xlators/features/mac-compat/src/Makefile.am +++ b/xlators/features/mac-compat/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = mac-compat.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -mac_compat_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +mac_compat_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) mac_compat_la_SOURCES = mac-compat.c mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am index d122c0bfc08..0465b02012e 100644 --- a/xlators/features/marker/src/Makefile.am +++ b/xlators/features/marker/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = marker.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -marker_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +marker_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/path-convertor/src/Makefile.am b/xlators/features/path-convertor/src/Makefile.am index 9b5c7f45d12..7090698687b 100644 --- a/xlators/features/path-convertor/src/Makefile.am +++ b/xlators/features/path-convertor/src/Makefile.am @@ -2,7 +2,7 @@ xlator_LTLIBRARIES = path-converter.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features -path_converter_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +path_converter_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) path_converter_la_SOURCES = path.c path_converter_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am index bc0643d6806..98499712fab 100644 --- a/xlators/features/protect/src/Makefile.am +++ b/xlators/features/protect/src/Makefile.am @@ -2,15 +2,15 @@ xlator_LTLIBRARIES = prot_dht.la prot_client.la prot_server.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -prot_dht_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +prot_dht_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) prot_dht_la_SOURCES = prot_dht.c prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -prot_client_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +prot_client_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) prot_client_la_SOURCES = prot_client.c prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -prot_server_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +prot_server_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) prot_server_la_SOURCES = prot_server.c prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am index 862ca76f3e5..6468669af2a 100644 --- a/xlators/features/quiesce/src/Makefile.am +++ b/xlators/features/quiesce/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = quiesce.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -quiesce_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +quiesce_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) quiesce_la_SOURCES = quiesce.c quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am index a6d2c86bf58..a15135347ac 100644 --- a/xlators/features/quota/src/Makefile.am +++ b/xlators/features/quota/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = quota.la quotad.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -quota_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +quota_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) quotad_la_LDFLAGS = -module -avoid-version -export-symbols $(top_srcdir)/xlators/features/quota/src/quotad.sym quota_la_SOURCES = quota.c quota-enforcer-client.c diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am index a44fd36f035..5aad7079344 100644 --- a/xlators/features/read-only/src/Makefile.am +++ b/xlators/features/read-only/src/Makefile.am @@ -4,12 +4,12 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features noinst_HEADERS = read-only.h read-only-mem-types.h read-only-common.h -read_only_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +read_only_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) read_only_la_SOURCES = read-only.c read-only-common.c read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -worm_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +worm_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) worm_la_SOURCES = read-only-common.c worm.c worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/shard/src/Makefile.am b/xlators/features/shard/src/Makefile.am index 3569eb69afa..89173f1203e 100644 --- a/xlators/features/shard/src/Makefile.am +++ b/xlators/features/shard/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = shard.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -shard_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +shard_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) shard_la_SOURCES = shard.c diff --git a/xlators/features/snapview-client/src/Makefile.am b/xlators/features/snapview-client/src/Makefile.am index 3b08e685092..72d8a2a1973 100644 --- a/xlators/features/snapview-client/src/Makefile.am +++ b/xlators/features/snapview-client/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = snapview-client.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -snapview_client_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +snapview_client_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) snapview_client_la_SOURCES = snapview-client.c snapview_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/snapview-server/src/Makefile.am b/xlators/features/snapview-server/src/Makefile.am index 004741cedad..6b588e5d235 100644 --- a/xlators/features/snapview-server/src/Makefile.am +++ b/xlators/features/snapview-server/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = snapview-server.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -snapview_server_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +snapview_server_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) snapview_server_la_SOURCES = snapview-server.c snapview-server-mgmt.c snapview-server-helpers.c snapview_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\ diff --git a/xlators/features/trash/src/Makefile.am b/xlators/features/trash/src/Makefile.am index dc216c366f1..1304618cc68 100644 --- a/xlators/features/trash/src/Makefile.am +++ b/xlators/features/trash/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = trash.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -trash_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +trash_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) trash_la_SOURCES = trash.c trash_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/features/upcall/src/Makefile.am b/xlators/features/upcall/src/Makefile.am index a81c36940e5..7f63e792281 100644 --- a/xlators/features/upcall/src/Makefile.am +++ b/xlators/features/upcall/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = upcall.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features -upcall_la_LDFLAGS = $(GF_XLATOR_DEFAULT_LDFLAGS) +upcall_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) upcall_la_SOURCES = upcall.c upcall-internal.c -- cgit