diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-03-19 18:03:54 +0100 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-03-21 17:28:15 -0700 |
| commit | eb87c96f49b3dd2c7460e58c54ce909c706cd475 (patch) | |
| tree | acc1947d821fdb1a1645c2aba4c5a859e25e3b57 | |
| parent | 128863af2d7f37571583fe37424e76b46f8525d4 (diff) | |
build: do not create versioned <xlator>.so files
There has been a misspelled option in the Makefile.am files. The option
is called -avoid-version, and not -avoidversion.
It is not trivial to provide a test-case for this. One way would be to
check generated RPMs with a command like this (output should be empty):
$ rpm -qlp *.rpm | grep -E '/xlator/.+.so.0'
Change-Id: I2a6cc557eada4d098b73af5a254f8c75707543da
BUG: 1078365
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/7299
Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | xlators/encryption/crypt/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/features/changelog/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/features/compress/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/features/protect/src/Makefile.am | 6 | ||||
| -rw-r--r-- | xlators/performance/readdir-ahead/src/Makefile.am | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am index faadd117fad..b13f65043d3 100644 --- a/xlators/encryption/crypt/src/Makefile.am +++ b/xlators/encryption/crypt/src/Makefile.am @@ -3,7 +3,7 @@ if ENABLE_CRYPT_XLATOR xlator_LTLIBRARIES = crypt.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption -crypt_la_LDFLAGS = -module -avoidversion -lssl -lcrypto +crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c crypt_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 e85031ad496..54c21ac213c 100644 --- a/xlators/features/changelog/src/Makefile.am +++ b/xlators/features/changelog/src/Makefile.am @@ -5,7 +5,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \ changelog-misc.h changelog-encoders.h changelog-notifier.h -changelog_la_LDFLAGS = -module -avoidversion +changelog_la_LDFLAGS = -module -avoid-version changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \ changelog-encoders.c changelog-notifier.c diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am index 4a64b52a9a1..0bf757c063e 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 = -module -avoidversion $(LIBZ_LIBS) +cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS) cdc_la_SOURCES = cdc.c cdc-helper.c cdc_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 7eb93f32e11..968e88c457a 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 = -module -avoidversion +prot_dht_la_LDFLAGS = -module -avoid-version prot_dht_la_SOURCES = prot_dht.c prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -prot_client_la_LDFLAGS = -module -avoidversion +prot_client_la_LDFLAGS = -module -avoid-version prot_client_la_SOURCES = prot_client.c prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -prot_server_la_LDFLAGS = -module -avoidversion +prot_server_la_LDFLAGS = -module -avoid-version prot_server_la_SOURCES = prot_server.c prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la diff --git a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am index cdabd14284e..539d6ede434 100644 --- a/xlators/performance/readdir-ahead/src/Makefile.am +++ b/xlators/performance/readdir-ahead/src/Makefile.am @@ -1,7 +1,7 @@ xlator_LTLIBRARIES = readdir-ahead.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance -readdir_ahead_la_LDFLAGS = -module -avoidversion +readdir_ahead_la_LDFLAGS = -module -avoid-version readdir_ahead_la_SOURCES = readdir-ahead.c readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |