summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/glusterfs/Manifest1
-rw-r--r--sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch576
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.5.4.ebuild182
3 files changed, 0 insertions, 759 deletions
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 9d286d388f6..4b45438299d 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,4 @@
DIST glusterfs-3.10.1.tar.gz 8926368 SHA256 d3c23df3299964efe6b688c94ddde258506ecf173b58e8c07fa18d470bb21517 SHA512 35acf10d37db7ca9cf7d88e4eabcac4febdccfe15cbe68df86c44042987547f3a56447a1ced5ed238d171efdbcb97dd1fc6917283641bdcd7d476deb37ad0871 WHIRLPOOL 7ce3b5cbe136b1d09b4c0c062decf0d9c5bba03f9b7249648e886ceff758061e73863c9f6d82ed2de3fc41546950ee08c022683174283dc03201c12d61d295aa
-DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068
DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8
DIST glusterfs-3.8.11.tar.gz 8544971 SHA256 2285c02f9449168eabeaa7b72706e80f3de659eb685293dd899c71c33798702e SHA512 61cadc567a73403c78eac5e472aadd1457053be936042ea1218c172760376b026152e84b4ca15a0c249524347d434cc7d35c3a73f4d0b01e89c6aec5edcbbb49 WHIRLPOOL 21d4c2da1d281cb03181c21385a62d74c71f24936d2c33da22085accb5fa563b7095757b7df3eb30bf865c37fe683c420756c542d6933c99c0d3f9025c07a217
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
deleted file mode 100644
index 9acf0d7526c..00000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.5.1-build-shared-only.patch
+++ /dev/null
@@ -1,576 +0,0 @@
-diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
-index 2bf7cf2..8e52d70 100644
---- a/rpc/rpc-transport/rdma/src/Makefile.am
-+++ b/rpc/rpc-transport/rdma/src/Makefile.am
-@@ -3,7 +3,7 @@
- transport_LTLIBRARIES = rdma.la
- transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
-
--rdma_la_LDFLAGS = -module -avoid-version
-+rdma_la_LDFLAGS = -module -avoid-version -shared
-
- rdma_la_SOURCES = rdma.c name.c
- rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
-index 71e6ed6..b481fe9 100644
---- a/rpc/rpc-transport/socket/src/Makefile.am
-+++ b/rpc/rpc-transport/socket/src/Makefile.am
-@@ -3,7 +3,7 @@ noinst_HEADERS = socket.h name.h
- rpctransport_LTLIBRARIES = socket.la
- rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
-
--socket_la_LDFLAGS = -module -avoid-version
-+socket_la_LDFLAGS = -module -avoid-version -shared
-
- socket_la_SOURCES = socket.c name.c
- socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
-diff --git a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
-index 35d18a6..959fea8 100644
---- a/xlators/cluster/afr/src/Makefile.am
-+++ b/xlators/cluster/afr/src/Makefile.am
-@@ -7,11 +7,11 @@ afr_common_source = afr-dir-read.c afr-dir-write.c afr-inode-read.c \
- afr-self-heal-algorithm.c afr-lk-common.c afr-self-heald.c \
- $(top_builddir)/xlators/lib/src/libxlator.c
-
--afr_la_LDFLAGS = -module -avoid-version
-+afr_la_LDFLAGS = -module -avoid-version -shared
- afr_la_SOURCES = $(afr_common_source) afr.c
- afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
--pump_la_LDFLAGS = -module -avoid-version
-+pump_la_LDFLAGS = -module -avoid-version -shared
- pump_la_SOURCES = $(afr_common_source) pump.c
- pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
-diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
-index 174bea8..cab9993 100644
---- a/xlators/cluster/dht/src/Makefile.am
-+++ b/xlators/cluster/dht/src/Makefile.am
-@@ -12,13 +12,13 @@ dht_la_SOURCES = $(dht_common_source) dht.c
- nufa_la_SOURCES = $(dht_common_source) nufa.c
- switch_la_SOURCES = $(dht_common_source) switch.c
-
--dht_la_LDFLAGS = -module -avoid-version
-+dht_la_LDFLAGS = -module -avoid-version -shared
- dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
--nufa_la_LDFLAGS = -module -avoid-version
-+nufa_la_LDFLAGS = -module -avoid-version -shared
- nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
--switch_la_LDFLAGS = -module -avoid-version
-+switch_la_LDFLAGS = -module -avoid-version -shared
- switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
- noinst_HEADERS = dht-common.h dht-mem-types.h \
-diff --git a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
-index 2d15142..6989de9 100644
---- a/xlators/cluster/stripe/src/Makefile.am
-+++ b/xlators/cluster/stripe/src/Makefile.am
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = stripe.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
-
--stripe_la_LDFLAGS = -module -avoid-version
-+stripe_la_LDFLAGS = -module -avoid-version -shared
-
- stripe_la_SOURCES = stripe.c stripe-helpers.c \
- $(top_builddir)/xlators/lib/src/libxlator.c
-diff --git a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
-index 5075c59..a7681c4 100644
---- a/xlators/debug/error-gen/src/Makefile.am
-+++ b/xlators/debug/error-gen/src/Makefile.am
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = error-gen.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
-
--error_gen_la_LDFLAGS = -module -avoid-version
-+error_gen_la_LDFLAGS = -module -avoid-version -shared
-
- error_gen_la_SOURCES = error-gen.c
- error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
-index 332d790..bf62017 100644
---- a/xlators/debug/io-stats/src/Makefile.am
-+++ b/xlators/debug/io-stats/src/Makefile.am
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = io-stats.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
-
--io_stats_la_LDFLAGS = -module -avoid-version
-+io_stats_la_LDFLAGS = -module -avoid-version -shared
-
- io_stats_la_SOURCES = io-stats.c
- io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
-index 7b2597b..2030ed4 100644
---- a/xlators/debug/trace/src/Makefile.am
-+++ b/xlators/debug/trace/src/Makefile.am
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = trace.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
-
--trace_la_LDFLAGS = -module -avoid-version
-+trace_la_LDFLAGS = -module -avoid-version -shared
-
- trace_la_SOURCES = trace.c
- trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
-index d7ebac6..66ae6f5 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 -avoid-version
-+crypt_la_LDFLAGS = -module -avoid-version -shared
-
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
- crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
-diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
-index 94e8d18..d13894e 100644
---- a/xlators/encryption/rot-13/src/Makefile.am
-+++ b/xlators/encryption/rot-13/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = rot-13.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
-
--rot_13_la_LDFLAGS = -module -avoid-version
-+rot_13_la_LDFLAGS = -module -avoid-version -shared
-
- rot_13_la_SOURCES = rot-13.c
- rot_13_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 54c21ac..d98f43f 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 -avoid-version
-+changelog_la_LDFLAGS = -module -avoid-version -shared
-
- 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 d3abe03..659cd49 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 -avoid-version
-+cdc_la_LDFLAGS = -module -avoid-version -shared
-
- cdc_la_SOURCES = cdc.c cdc-helper.c
- cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
-diff --git a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
-index db53aff..4eeaa4f 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 = -module -avoid-version
-+gfid_access_la_LDFLAGS = -module -avoid-version -shared
-
- 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 73bb897..5519798 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 = -module -avoid-version
-+index_la_LDFLAGS = -module -avoid-version -shared
-
- 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 0f79731..eda6a05 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 = -module -avoid-version
-+locks_la_LDFLAGS = -module -avoid-version -shared
-
- 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 f8567ed..a283eb0 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 = -module -avoid-version
-+mac_compat_la_LDFLAGS = -module -avoid-version -shared
-
- 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 a7c6764..477fe0f 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 = -module -avoid-version
-+marker_la_LDFLAGS = -module -avoid-version -shared
-
- 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/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
-index 968e88c..84ceec2 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 -avoid-version
-+prot_dht_la_LDFLAGS = -module -avoid-version -shared
- prot_dht_la_SOURCES = prot_dht.c
- prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
--prot_client_la_LDFLAGS = -module -avoid-version
-+prot_client_la_LDFLAGS = -module -avoid-version -shared
- prot_client_la_SOURCES = prot_client.c
- prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
--prot_server_la_LDFLAGS = -module -avoid-version
-+prot_server_la_LDFLAGS = -module -avoid-version -shared
- prot_server_la_SOURCES = prot_server.c
- prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
-diff --git a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
-index 08a7b62..30639e0 100644
---- a/xlators/features/qemu-block/src/Makefile.am
-+++ b/xlators/features/qemu-block/src/Makefile.am
-@@ -2,7 +2,7 @@ if ENABLE_QEMU_BLOCK
- xlator_LTLIBRARIES = qemu-block.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
-
--qemu_block_la_LDFLAGS = -module -avoid-version
-+qemu_block_la_LDFLAGS = -module -avoid-version -shared
- qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) -lz -lrt
-
- qemu_block_la_SOURCES_qemu = \
-diff --git a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
-index 15e4662..b3cd9d1 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 = -module -avoid-version
-+quiesce_la_LDFLAGS = -module -avoid-version -shared
-
- 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 7165adc..06905f3 100644
---- a/xlators/features/quota/src/Makefile.am
-+++ b/xlators/features/quota/src/Makefile.am
-@@ -1,8 +1,8 @@
- xlator_LTLIBRARIES = quota.la quotad.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
-
--quota_la_LDFLAGS = -module -avoid-version
--quotad_la_LDFLAGS = -module -avoid-version
-+quota_la_LDFLAGS = -module -avoid-version -shared
-+quotad_la_LDFLAGS = -module -avoid-version -shared
-
- quota_la_SOURCES = quota.c quota-enforcer-client.c
- quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
-index 4c14621..a3f79fa 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-common.h
-
--read_only_la_LDFLAGS = -module -avoid-version
-+read_only_la_LDFLAGS = -module -avoid-version -shared
-
- read_only_la_SOURCES = read-only.c read-only-common.c
- read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
--worm_la_LDFLAGS = -module -avoid-version
-+worm_la_LDFLAGS = -module -avoid-version -shared
-
- worm_la_SOURCES = read-only-common.c worm.c
- worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
-index a6f49ae..b071280 100644
---- a/xlators/mgmt/glusterd/src/Makefile.am
-+++ b/xlators/mgmt/glusterd/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = glusterd.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
- glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
--glusterd_la_LDFLAGS = -module -avoid-version
-+glusterd_la_LDFLAGS = -module -avoid-version -shared
- if ENABLE_BD_XLATOR
- glusterd_la_LDFLAGS += -llvm2app
- endif
-diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
-index 653121d..3f221d8 100644
---- a/xlators/mount/fuse/src/Makefile.am
-+++ b/xlators/mount/fuse/src/Makefile.am
-@@ -24,7 +24,7 @@ endif
- fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
- $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
-
--fuse_la_LDFLAGS = -module -avoid-version
-+fuse_la_LDFLAGS = -module -avoid-version -shared
- fuse_la_LIBADD = @GF_FUSE_LDADD@
-
- AM_CPPFLAGS = $(GF_CPPFLAGS) \
-diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
-index 62fbf65..1995f67 100644
---- a/xlators/nfs/server/src/Makefile.am
-+++ b/xlators/nfs/server/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = server.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs
- nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src
--server_la_LDFLAGS = -module -avoid-version
-+server_la_LDFLAGS = -module -avoid-version -shared
- server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \
- nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \
- nlmcbk_svc.c mount3udp_svc.c acl3.c
-diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
-index 155be99..ba0738c 100644
---- a/xlators/performance/io-cache/src/Makefile.am
-+++ b/xlators/performance/io-cache/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = io-cache.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--io_cache_la_LDFLAGS = -module -avoid-version
-+io_cache_la_LDFLAGS = -module -avoid-version -shared
-
- io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c
- io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
-index d63042e..aba1fdb 100644
---- a/xlators/performance/io-threads/src/Makefile.am
-+++ b/xlators/performance/io-threads/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = io-threads.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--io_threads_la_LDFLAGS = -module -avoid-version
-+io_threads_la_LDFLAGS = -module -avoid-version -shared
-
- io_threads_la_SOURCES = io-threads.c
- io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
-index 8c9f5a8..4d714fa 100644
---- a/xlators/performance/md-cache/src/Makefile.am
-+++ b/xlators/performance/md-cache/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = md-cache.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--md_cache_la_LDFLAGS = -module -avoid-version
-+md_cache_la_LDFLAGS = -module -avoid-version -shared
-
- md_cache_la_SOURCES = md-cache.c
- md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
-index 1252857..568434a 100644
---- a/xlators/performance/open-behind/src/Makefile.am
-+++ b/xlators/performance/open-behind/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = open-behind.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--open_behind_la_LDFLAGS = -module -avoid-version
-+open_behind_la_LDFLAGS = -module -avoid-version -shared
-
- open_behind_la_SOURCES = open-behind.c
- open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
-index 4906f40..8d42116 100644
---- a/xlators/performance/quick-read/src/Makefile.am
-+++ b/xlators/performance/quick-read/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = quick-read.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--quick_read_la_LDFLAGS = -module -avoid-version
-+quick_read_la_LDFLAGS = -module -avoid-version -shared
-
- quick_read_la_SOURCES = quick-read.c
- quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
-index be80ae7..eae0540 100644
---- a/xlators/performance/read-ahead/src/Makefile.am
-+++ b/xlators/performance/read-ahead/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = read-ahead.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--read_ahead_la_LDFLAGS = -module -avoid-version
-+read_ahead_la_LDFLAGS = -module -avoid-version -shared
-
- read_ahead_la_SOURCES = read-ahead.c page.c
- read_ahead_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 539d6ed..020b670 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 -avoid-version
-+readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
-
- readdir_ahead_la_SOURCES = readdir-ahead.c
- readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
-index 4091c32..0d600d6 100644
---- a/xlators/performance/symlink-cache/src/Makefile.am
-+++ b/xlators/performance/symlink-cache/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = symlink-cache.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance
-
--symlink_cache_la_LDFLAGS = -module -avoid-version
-+symlink_cache_la_LDFLAGS = -module -avoid-version -shared
-
- symlink_cache_la_SOURCES = symlink-cache.c
- symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
-index 6c829d8..746e5c1 100644
---- a/xlators/performance/write-behind/src/Makefile.am
-+++ b/xlators/performance/write-behind/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = write-behind.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
-
--write_behind_la_LDFLAGS = -module -avoid-version
-+write_behind_la_LDFLAGS = -module -avoid-version -shared
-
- write_behind_la_SOURCES = write-behind.c
- write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
-index 21f1c5f..3161bc8 100644
---- a/xlators/playground/template/src/Makefile.am
-+++ b/xlators/playground/template/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = template.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
-
--template_la_LDFLAGS = -module -avoid-version
-+template_la_LDFLAGS = -module -avoid-version -shared
-
- template_la_SOURCES = template.c
- template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
-index 426e7c2..fa7234d 100644
---- a/xlators/protocol/auth/addr/src/Makefile.am
-+++ b/xlators/protocol/auth/addr/src/Makefile.am
-@@ -1,7 +1,7 @@
- auth_LTLIBRARIES = addr.la
- authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
-
--addr_la_LDFLAGS = -module -avoid-version
-+addr_la_LDFLAGS = -module -avoid-version -shared
-
- addr_la_SOURCES = addr.c
- addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
-index d84db91..022739d 100644
---- a/xlators/protocol/auth/login/src/Makefile.am
-+++ b/xlators/protocol/auth/login/src/Makefile.am
-@@ -1,7 +1,7 @@
- auth_LTLIBRARIES = login.la
- authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
-
--login_la_LDFLAGS = -module -avoid-version
-+login_la_LDFLAGS = -module -avoid-version -shared
-
- login_la_SOURCES = login.c
- login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
-index cf89d42..8f2612c 100644
---- a/xlators/protocol/client/src/Makefile.am
-+++ b/xlators/protocol/client/src/Makefile.am
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = client.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
-
--client_la_LDFLAGS = -module -avoid-version
-+client_la_LDFLAGS = -module -avoid-version -shared
-
- client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
-index 6a18bf0..9a0393f 100644
---- a/xlators/protocol/server/src/Makefile.am
-+++ b/xlators/protocol/server/src/Makefile.am
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = server.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
-
--server_la_LDFLAGS = -module -avoid-version
-+server_la_LDFLAGS = -module -avoid-version -shared
-
- server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-diff --git a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
-index 3d93f74..589185d 100644
---- a/xlators/storage/bd/src/Makefile.am
-+++ b/xlators/storage/bd/src/Makefile.am
-@@ -2,7 +2,7 @@ if ENABLE_BD_XLATOR
- xlator_LTLIBRARIES = bd.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
-
--bd_la_LDFLAGS = -module -avoid-version
-+bd_la_LDFLAGS = -module -avoid-version -shared
- LIBBD = -llvm2app -lrt
- bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
- bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
-diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
-index 88efcc7..79ca903 100644
---- a/xlators/storage/posix/src/Makefile.am
-+++ b/xlators/storage/posix/src/Makefile.am
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = posix.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
-
--posix_la_LDFLAGS = -module -avoid-version
-+posix_la_LDFLAGS = -module -avoid-version -shared
-
- posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c
- posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO)
-diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
-index 11c939f..561c52d 100644
---- a/xlators/system/posix-acl/src/Makefile.am
-+++ b/xlators/system/posix-acl/src/Makefile.am
-@@ -1,6 +1,6 @@
- xlator_LTLIBRARIES = posix-acl.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system
--posix_acl_la_LDFLAGS = -module -avoid-version
-+posix_acl_la_LDFLAGS = -module -avoid-version -shared
- posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c
- posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
deleted file mode 100644
index 47828a12964..00000000000
--- a/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
- glupy? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
- emacs? ( virtual/emacs )
- fuse? ( >=sys-fs/fuse-2.7.0 )
- georeplication? ( ${PYTHON_DEPS} )
- infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
- qemu-block? ( dev-libs/glib:2 )
- systemtap? ( dev-util/systemtap )
- xml? ( dev-libs/libxml2 )
- sys-libs/readline:=
- dev-libs/libaio
- dev-libs/openssl:=
- || ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/bison
- sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
- "${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
- "${FILESDIR}/${PN}-3.5.1-build-shared-only.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-# if the argp.h header is found in the system. Which should be the case with
-# glibc or if argp-standalone is installed.
-
-pkg_setup() {
- ( use georeplication || use glupy ) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- autotools-utils_src_prepare
-
- # argp-standalone source dir is not clean...
- cd argp-standalone
- emake distclean
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-dependency-tracking
- --disable-silent-rules
- --disable-fusermount
- $(use_enable debug)
- $(use_enable bd-xlator)
- $(use_enable crypt-xlator)
- $(use_enable fuse fuse-client)
- $(use_enable georeplication)
- $(use_enable glupy)
- $(use_enable infiniband ibverbs)
- $(use_enable qemu-block)
- $(use_enable static-libs static)
- $(use_enable syslog)
- $(use_enable systemtap)
- $(use_enable xml xml-output)
- --docdir=/usr/share/doc/${PF}
- --localstatedir=/var
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
- autotools-utils_src_install
-
- rm \
- "${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
- "${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
- "${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
- if use rsyslog ; then
- insinto /etc/rsyslog.d
- newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
- fi
-
- if use emacs ; then
- elisp-install ${PN} extras/glusterfs-mode.el*
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
- insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
- fi
-
- # insert some other tools which might be useful
- insinto /usr/share/glusterfs/scripts
- doins \
- extras/backend-{cleanup,xattr-sanitize}.sh \
- extras/clear_xattrs.sh \
- extras/migrate-unify-to-distribute.sh
-
- # correct permissions on installed scripts
- # fperms 0755 /usr/share/glusterfs/scripts/*.sh
- chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
- if use georeplication ; then
- # move the gsync-sync-gfid tool to a binary path
- # and set a symlink to be compliant with all other distros
- mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
- dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
- fi
-
- newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
- newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
- keepdir /var/log/${PN}
- keepdir /var/lib/glusterd
-
- # QA
- rm -rf "${ED}/var/run/" || die
- use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
- use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
- elog " /etc/init.d/glusterd start"
- echo
- elog "For static configurations, the glusterfsd startup script can be multiplexed."
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
- elog "separate service. To create additional instances of the glusterfsd service"
- elog "simply create a symlink to the glusterfsd startup script."
- echo
- elog "Example:"
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
- elog "You can now treat glusterfsd2 like any other service"
- echo
- ewarn "You need to use a ntp client to keep the clocks synchronized across all"
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
- ewarn "run GlusterFS."
-
- elog
- elog "If you are upgrading from a previous version of ${PN}, please read:"
- elog " http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5"
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}