1 |
commit: 46fcef61e9b171a5d17c75d2cd2a5602f26e0801 |
2 |
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 28 09:34:51 2015 +0000 |
4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 28 09:35:09 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fcef61 |
7 |
|
8 |
sys-cluster/glusterfs: drop old and vulnerable versions wrt #558422 #541540, version bump fix #548734 #550256 |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
sys-cluster/glusterfs/Manifest | 5 +- |
13 |
.../files/glusterfs-3.6.5-build-shared-only.patch | 547 +++++++++++++++++++++ |
14 |
sys-cluster/glusterfs/glusterfs-3.2.7.ebuild | 122 ----- |
15 |
sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild | 135 ----- |
16 |
...usterfs-3.5.3.ebuild => glusterfs-3.5.4.ebuild} | 9 + |
17 |
...usterfs-3.5.3.ebuild => glusterfs-3.6.5.ebuild} | 11 +- |
18 |
6 files changed, 568 insertions(+), 261 deletions(-) |
19 |
|
20 |
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest |
21 |
index e08b350..3115e9b 100644 |
22 |
--- a/sys-cluster/glusterfs/Manifest |
23 |
+++ b/sys-cluster/glusterfs/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79 |
26 |
-DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284 |
27 |
-DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf |
28 |
-DIST glusterfs-3.5.3.tar.gz 5021529 SHA256 d805d77da721e6fcb839f1208a9315b4f37b9d2a12c375dd47e5db4a60f5b6c2 SHA512 5a360c9d5180d1e59b8cac9900e4cf776aebf59fd59cca6a0ef27a84cae3781c8c5640b253c73888af751344dce9fd19c1b26bd9aa590ba4fc860143c990f30a WHIRLPOOL a08d3fc6f66dd4191d95611e1b626d8b393e2b8620800039cde20fcebe1643dc2cfe9e7eb3ce3be31aa4f17b8fc881060d40e3493ce189b93668716e2c7ae86d |
29 |
+DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068 |
30 |
+DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e |
31 |
|
32 |
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch |
33 |
new file mode 100644 |
34 |
index 0000000..af5332b |
35 |
--- /dev/null |
36 |
+++ b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch |
37 |
@@ -0,0 +1,547 @@ |
38 |
+diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am |
39 |
+--- a/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200 |
40 |
++++ b/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 11:00:36.322686236 +0200 |
41 |
+@@ -3,7 +3,7 @@ |
42 |
+ transport_LTLIBRARIES = rdma.la |
43 |
+ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport |
44 |
+ |
45 |
+-rdma_la_LDFLAGS = -module -avoid-version -nostartfiles |
46 |
++rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared |
47 |
+ |
48 |
+ rdma_la_SOURCES = rdma.c name.c |
49 |
+ rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ |
50 |
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig |
51 |
+Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej |
52 |
+diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am |
53 |
+--- a/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200 |
54 |
++++ b/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
55 |
+@@ -3,7 +3,7 @@ |
56 |
+ rpctransport_LTLIBRARIES = socket.la |
57 |
+ rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport |
58 |
+ |
59 |
+-socket_la_LDFLAGS = -module -avoid-version |
60 |
++socket_la_LDFLAGS = -module -avoid-version -shared |
61 |
+ |
62 |
+ socket_la_SOURCES = socket.c name.c |
63 |
+ socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl |
64 |
+diff -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am |
65 |
+--- a/xlators/cluster/afr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
66 |
++++ b/xlators/cluster/afr/src/Makefile.am 2015-08-28 11:01:31.603219323 +0200 |
67 |
+@@ -10,11 +10,11 @@ |
68 |
+ afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \ |
69 |
+ afr-self-heal-name.c |
70 |
+ |
71 |
+-afr_la_LDFLAGS = -module -avoid-version |
72 |
++afr_la_LDFLAGS = -module -avoid-version -shared |
73 |
+ afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) afr.c |
74 |
+ afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
75 |
+ |
76 |
+-pump_la_LDFLAGS = -module -avoid-version |
77 |
++pump_la_LDFLAGS = -module -avoid-version -shared |
78 |
+ pump_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) pump.c |
79 |
+ pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
80 |
+ |
81 |
+Only in b/xlators/cluster/afr/src: Makefile.am.orig |
82 |
+Only in b/xlators/cluster/afr/src: Makefile.am.rej |
83 |
+diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am |
84 |
+--- a/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
85 |
++++ b/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
86 |
+@@ -11,13 +11,13 @@ |
87 |
+ nufa_la_SOURCES = $(dht_common_source) nufa.c |
88 |
+ switch_la_SOURCES = $(dht_common_source) switch.c |
89 |
+ |
90 |
+-dht_la_LDFLAGS = -module -avoid-version |
91 |
++dht_la_LDFLAGS = -module -avoid-version -shared |
92 |
+ dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
93 |
+ |
94 |
+-nufa_la_LDFLAGS = -module -avoid-version |
95 |
++nufa_la_LDFLAGS = -module -avoid-version -shared |
96 |
+ nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
97 |
+ |
98 |
+-switch_la_LDFLAGS = -module -avoid-version |
99 |
++switch_la_LDFLAGS = -module -avoid-version -shared |
100 |
+ switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
101 |
+ |
102 |
+ noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h \ |
103 |
+Only in b/xlators/cluster/dht/src: Makefile.am.orig |
104 |
+diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am |
105 |
+--- a/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
106 |
++++ b/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
107 |
+@@ -1,7 +1,7 @@ |
108 |
+ xlator_LTLIBRARIES = stripe.la |
109 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster |
110 |
+ |
111 |
+-stripe_la_LDFLAGS = -module -avoid-version |
112 |
++stripe_la_LDFLAGS = -module -avoid-version -shared |
113 |
+ |
114 |
+ stripe_la_SOURCES = stripe.c stripe-helpers.c \ |
115 |
+ $(top_builddir)/xlators/lib/src/libxlator.c |
116 |
+Only in b/xlators/cluster/stripe/src: Makefile.am.orig |
117 |
+diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am |
118 |
+--- a/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
119 |
++++ b/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
120 |
+@@ -2,7 +2,7 @@ |
121 |
+ xlator_LTLIBRARIES = error-gen.la |
122 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug |
123 |
+ |
124 |
+-error_gen_la_LDFLAGS = -module -avoid-version |
125 |
++error_gen_la_LDFLAGS = -module -avoid-version -shared |
126 |
+ |
127 |
+ error_gen_la_SOURCES = error-gen.c |
128 |
+ error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
129 |
+diff -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am |
130 |
+--- a/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
131 |
++++ b/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
132 |
+@@ -2,7 +2,7 @@ |
133 |
+ xlator_LTLIBRARIES = io-stats.la |
134 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug |
135 |
+ |
136 |
+-io_stats_la_LDFLAGS = -module -avoid-version |
137 |
++io_stats_la_LDFLAGS = -module -avoid-version -shared |
138 |
+ |
139 |
+ io_stats_la_SOURCES = io-stats.c |
140 |
+ io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
141 |
+diff -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am |
142 |
+--- a/xlators/debug/trace/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
143 |
++++ b/xlators/debug/trace/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
144 |
+@@ -2,7 +2,7 @@ |
145 |
+ xlator_LTLIBRARIES = trace.la |
146 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug |
147 |
+ |
148 |
+-trace_la_LDFLAGS = -module -avoid-version |
149 |
++trace_la_LDFLAGS = -module -avoid-version -shared |
150 |
+ |
151 |
+ trace_la_SOURCES = trace.c |
152 |
+ trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
153 |
+diff -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am |
154 |
+--- a/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200 |
155 |
++++ b/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:16:28.051864039 +0200 |
156 |
+@@ -3,7 +3,7 @@ |
157 |
+ xlator_LTLIBRARIES = crypt.la |
158 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption |
159 |
+ |
160 |
+-crypt_la_LDFLAGS = -module -avoid-version |
161 |
++crypt_la_LDFLAGS = -module -avoid-version -shared |
162 |
+ |
163 |
+ crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c |
164 |
+ crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto |
165 |
+Only in b/xlators/encryption/crypt/src: Makefile.am.orig |
166 |
+Only in b/xlators/encryption/crypt/src: Makefile.am.rej |
167 |
+diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am |
168 |
+--- a/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
169 |
++++ b/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
170 |
+@@ -1,7 +1,7 @@ |
171 |
+ xlator_LTLIBRARIES = rot-13.la |
172 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption |
173 |
+ |
174 |
+-rot_13_la_LDFLAGS = -module -avoid-version |
175 |
++rot_13_la_LDFLAGS = -module -avoid-version -shared |
176 |
+ |
177 |
+ rot_13_la_SOURCES = rot-13.c |
178 |
+ rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
179 |
+diff -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am |
180 |
+--- a/xlators/features/changelog/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
181 |
++++ b/xlators/features/changelog/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
182 |
+@@ -5,7 +5,7 @@ |
183 |
+ noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \ |
184 |
+ changelog-misc.h changelog-encoders.h changelog-notifier.h |
185 |
+ |
186 |
+-changelog_la_LDFLAGS = -module -avoid-version |
187 |
++changelog_la_LDFLAGS = -module -avoid-version -shared |
188 |
+ |
189 |
+ changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \ |
190 |
+ changelog-encoders.c changelog-notifier.c changelog-barrier.c |
191 |
+Only in b/xlators/features/changelog/src: Makefile.am.orig |
192 |
+diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am |
193 |
+--- a/xlators/features/compress/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200 |
194 |
++++ b/xlators/features/compress/src/Makefile.am 2015-08-28 11:17:19.492360095 +0200 |
195 |
+@@ -4,7 +4,7 @@ |
196 |
+ |
197 |
+ noinst_HEADERS = cdc.h cdc-mem-types.h |
198 |
+ |
199 |
+-cdc_la_LDFLAGS = -module -avoid-version |
200 |
++cdc_la_LDFLAGS = -module -avoid-version -shared |
201 |
+ |
202 |
+ cdc_la_SOURCES = cdc.c cdc-helper.c |
203 |
+ cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) |
204 |
+Only in b/xlators/features/compress/src: Makefile.am.rej |
205 |
+diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am |
206 |
+--- a/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
207 |
++++ b/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
208 |
+@@ -1,7 +1,7 @@ |
209 |
+ xlator_LTLIBRARIES = gfid-access.la |
210 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
211 |
+ |
212 |
+-gfid_access_la_LDFLAGS = -module -avoid-version |
213 |
++gfid_access_la_LDFLAGS = -module -avoid-version -shared |
214 |
+ |
215 |
+ gfid_access_la_SOURCES = gfid-access.c |
216 |
+ gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
217 |
+diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am |
218 |
+--- a/xlators/features/index/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
219 |
++++ b/xlators/features/index/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
220 |
+@@ -1,7 +1,7 @@ |
221 |
+ xlator_LTLIBRARIES = index.la |
222 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
223 |
+ |
224 |
+-index_la_LDFLAGS = -module -avoid-version |
225 |
++index_la_LDFLAGS = -module -avoid-version -shared |
226 |
+ |
227 |
+ index_la_SOURCES = index.c |
228 |
+ index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
229 |
+diff -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am |
230 |
+--- a/xlators/features/locks/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
231 |
++++ b/xlators/features/locks/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
232 |
+@@ -1,7 +1,7 @@ |
233 |
+ xlator_LTLIBRARIES = locks.la |
234 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
235 |
+ |
236 |
+-locks_la_LDFLAGS = -module -avoid-version |
237 |
++locks_la_LDFLAGS = -module -avoid-version -shared |
238 |
+ |
239 |
+ locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ |
240 |
+ clear.c |
241 |
+diff -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am |
242 |
+--- a/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
243 |
++++ b/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
244 |
+@@ -1,7 +1,7 @@ |
245 |
+ xlator_LTLIBRARIES = mac-compat.la |
246 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
247 |
+ |
248 |
+-mac_compat_la_LDFLAGS = -module -avoid-version |
249 |
++mac_compat_la_LDFLAGS = -module -avoid-version -shared |
250 |
+ |
251 |
+ mac_compat_la_SOURCES = mac-compat.c |
252 |
+ mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
253 |
+diff -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am |
254 |
+--- a/xlators/features/marker/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
255 |
++++ b/xlators/features/marker/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
256 |
+@@ -1,7 +1,7 @@ |
257 |
+ xlator_LTLIBRARIES = marker.la |
258 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
259 |
+ |
260 |
+-marker_la_LDFLAGS = -module -avoid-version |
261 |
++marker_la_LDFLAGS = -module -avoid-version -shared |
262 |
+ |
263 |
+ marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c |
264 |
+ marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
265 |
+diff -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am |
266 |
+--- a/xlators/features/protect/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
267 |
++++ b/xlators/features/protect/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
268 |
+@@ -2,15 +2,15 @@ |
269 |
+ |
270 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
271 |
+ |
272 |
+-prot_dht_la_LDFLAGS = -module -avoid-version |
273 |
++prot_dht_la_LDFLAGS = -module -avoid-version -shared |
274 |
+ prot_dht_la_SOURCES = prot_dht.c |
275 |
+ prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
276 |
+ |
277 |
+-prot_client_la_LDFLAGS = -module -avoid-version |
278 |
++prot_client_la_LDFLAGS = -module -avoid-version -shared |
279 |
+ prot_client_la_SOURCES = prot_client.c |
280 |
+ prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
281 |
+ |
282 |
+-prot_server_la_LDFLAGS = -module -avoid-version |
283 |
++prot_server_la_LDFLAGS = -module -avoid-version -shared |
284 |
+ prot_server_la_SOURCES = prot_server.c |
285 |
+ prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
286 |
+ |
287 |
+diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am |
288 |
+--- a/xlators/features/qemu-block/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
289 |
++++ b/xlators/features/qemu-block/src/Makefile.am 2015-08-28 11:03:19.464259458 +0200 |
290 |
+@@ -2,7 +2,7 @@ |
291 |
+ xlator_LTLIBRARIES = qemu-block.la |
292 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
293 |
+ |
294 |
+-qemu_block_la_LDFLAGS = -module -avoid-version |
295 |
++qemu_block_la_LDFLAGS = -module -avoid-version -shared |
296 |
+ qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt |
297 |
+ |
298 |
+ qemu_block_la_SOURCES_qemu = \ |
299 |
+Only in b/xlators/features/qemu-block/src: Makefile.am.orig |
300 |
+Only in b/xlators/features/qemu-block/src: Makefile.am.rej |
301 |
+diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am |
302 |
+--- a/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
303 |
++++ b/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
304 |
+@@ -1,7 +1,7 @@ |
305 |
+ xlator_LTLIBRARIES = quiesce.la |
306 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
307 |
+ |
308 |
+-quiesce_la_LDFLAGS = -module -avoid-version |
309 |
++quiesce_la_LDFLAGS = -module -avoid-version -shared |
310 |
+ |
311 |
+ quiesce_la_SOURCES = quiesce.c |
312 |
+ quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
313 |
+diff -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am |
314 |
+--- a/xlators/features/quota/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
315 |
++++ b/xlators/features/quota/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
316 |
+@@ -1,8 +1,8 @@ |
317 |
+ xlator_LTLIBRARIES = quota.la quotad.la |
318 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features |
319 |
+ |
320 |
+-quota_la_LDFLAGS = -module -avoid-version |
321 |
+-quotad_la_LDFLAGS = -module -avoid-version |
322 |
++quota_la_LDFLAGS = -module -avoid-version -shared |
323 |
++quotad_la_LDFLAGS = -module -avoid-version -shared |
324 |
+ |
325 |
+ quota_la_SOURCES = quota.c quota-enforcer-client.c |
326 |
+ quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
327 |
+diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am |
328 |
+--- a/xlators/features/read-only/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
329 |
++++ b/xlators/features/read-only/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
330 |
+@@ -4,12 +4,12 @@ |
331 |
+ |
332 |
+ noinst_HEADERS = read-only-common.h |
333 |
+ |
334 |
+-read_only_la_LDFLAGS = -module -avoid-version |
335 |
++read_only_la_LDFLAGS = -module -avoid-version -shared |
336 |
+ |
337 |
+ read_only_la_SOURCES = read-only.c read-only-common.c |
338 |
+ read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
339 |
+ |
340 |
+-worm_la_LDFLAGS = -module -avoid-version |
341 |
++worm_la_LDFLAGS = -module -avoid-version -shared |
342 |
+ |
343 |
+ worm_la_SOURCES = read-only-common.c worm.c |
344 |
+ worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
345 |
+diff -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am |
346 |
+--- a/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
347 |
++++ b/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
348 |
+@@ -1,7 +1,7 @@ |
349 |
+ xlator_LTLIBRARIES = glusterd.la |
350 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt |
351 |
+ glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" |
352 |
+-glusterd_la_LDFLAGS = -module -avoid-version |
353 |
++glusterd_la_LDFLAGS = -module -avoid-version -shared |
354 |
+ if ENABLE_BD_XLATOR |
355 |
+ glusterd_la_LDFLAGS += -llvm2app |
356 |
+ endif |
357 |
+diff -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am |
358 |
+--- a/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
359 |
++++ b/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
360 |
+@@ -26,7 +26,7 @@ |
361 |
+ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ |
362 |
+ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) |
363 |
+ |
364 |
+-fuse_la_LDFLAGS = -module -avoid-version |
365 |
++fuse_la_LDFLAGS = -module -avoid-version -shared |
366 |
+ fuse_la_LIBADD = @GF_FUSE_LDADD@ |
367 |
+ |
368 |
+ AM_CPPFLAGS = $(GF_CPPFLAGS) \ |
369 |
+Only in b/xlators/mount/fuse/src: Makefile.am.orig |
370 |
+diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am |
371 |
+--- a/xlators/nfs/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
372 |
++++ b/xlators/nfs/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
373 |
+@@ -1,7 +1,7 @@ |
374 |
+ xlator_LTLIBRARIES = server.la |
375 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs |
376 |
+ nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src |
377 |
+-server_la_LDFLAGS = -module -avoid-version |
378 |
++server_la_LDFLAGS = -module -avoid-version -shared |
379 |
+ server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \ |
380 |
+ nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \ |
381 |
+ nlmcbk_svc.c mount3udp_svc.c acl3.c |
382 |
+diff -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am |
383 |
+--- a/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
384 |
++++ b/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
385 |
+@@ -1,7 +1,7 @@ |
386 |
+ xlator_LTLIBRARIES = io-cache.la |
387 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
388 |
+ |
389 |
+-io_cache_la_LDFLAGS = -module -avoid-version |
390 |
++io_cache_la_LDFLAGS = -module -avoid-version -shared |
391 |
+ |
392 |
+ io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c |
393 |
+ io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
394 |
+diff -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am |
395 |
+--- a/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
396 |
++++ b/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
397 |
+@@ -1,7 +1,7 @@ |
398 |
+ xlator_LTLIBRARIES = io-threads.la |
399 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
400 |
+ |
401 |
+-io_threads_la_LDFLAGS = -module -avoid-version |
402 |
++io_threads_la_LDFLAGS = -module -avoid-version -shared |
403 |
+ |
404 |
+ io_threads_la_SOURCES = io-threads.c |
405 |
+ io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
406 |
+diff -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am |
407 |
+--- a/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
408 |
++++ b/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
409 |
+@@ -1,7 +1,7 @@ |
410 |
+ xlator_LTLIBRARIES = md-cache.la |
411 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
412 |
+ |
413 |
+-md_cache_la_LDFLAGS = -module -avoid-version |
414 |
++md_cache_la_LDFLAGS = -module -avoid-version -shared |
415 |
+ |
416 |
+ md_cache_la_SOURCES = md-cache.c |
417 |
+ md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
418 |
+diff -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am |
419 |
+--- a/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
420 |
++++ b/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
421 |
+@@ -1,7 +1,7 @@ |
422 |
+ xlator_LTLIBRARIES = open-behind.la |
423 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
424 |
+ |
425 |
+-open_behind_la_LDFLAGS = -module -avoid-version |
426 |
++open_behind_la_LDFLAGS = -module -avoid-version -shared |
427 |
+ |
428 |
+ open_behind_la_SOURCES = open-behind.c |
429 |
+ open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
430 |
+diff -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am |
431 |
+--- a/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
432 |
++++ b/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
433 |
+@@ -1,7 +1,7 @@ |
434 |
+ xlator_LTLIBRARIES = quick-read.la |
435 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
436 |
+ |
437 |
+-quick_read_la_LDFLAGS = -module -avoid-version |
438 |
++quick_read_la_LDFLAGS = -module -avoid-version -shared |
439 |
+ |
440 |
+ quick_read_la_SOURCES = quick-read.c |
441 |
+ quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
442 |
+diff -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am |
443 |
+--- a/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
444 |
++++ b/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
445 |
+@@ -1,7 +1,7 @@ |
446 |
+ xlator_LTLIBRARIES = read-ahead.la |
447 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
448 |
+ |
449 |
+-read_ahead_la_LDFLAGS = -module -avoid-version |
450 |
++read_ahead_la_LDFLAGS = -module -avoid-version -shared |
451 |
+ |
452 |
+ read_ahead_la_SOURCES = read-ahead.c page.c |
453 |
+ read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
454 |
+diff -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am |
455 |
+--- a/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
456 |
++++ b/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
457 |
+@@ -1,7 +1,7 @@ |
458 |
+ xlator_LTLIBRARIES = readdir-ahead.la |
459 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
460 |
+ |
461 |
+-readdir_ahead_la_LDFLAGS = -module -avoid-version |
462 |
++readdir_ahead_la_LDFLAGS = -module -avoid-version -shared |
463 |
+ |
464 |
+ readdir_ahead_la_SOURCES = readdir-ahead.c |
465 |
+ readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
466 |
+diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am |
467 |
+--- a/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
468 |
++++ b/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
469 |
+@@ -1,7 +1,7 @@ |
470 |
+ xlator_LTLIBRARIES = symlink-cache.la |
471 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance |
472 |
+ |
473 |
+-symlink_cache_la_LDFLAGS = -module -avoid-version |
474 |
++symlink_cache_la_LDFLAGS = -module -avoid-version -shared |
475 |
+ |
476 |
+ symlink_cache_la_SOURCES = symlink-cache.c |
477 |
+ symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
478 |
+diff -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am |
479 |
+--- a/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 |
480 |
++++ b/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
481 |
+@@ -1,7 +1,7 @@ |
482 |
+ xlator_LTLIBRARIES = write-behind.la |
483 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance |
484 |
+ |
485 |
+-write_behind_la_LDFLAGS = -module -avoid-version |
486 |
++write_behind_la_LDFLAGS = -module -avoid-version -shared |
487 |
+ |
488 |
+ write_behind_la_SOURCES = write-behind.c |
489 |
+ write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
490 |
+diff -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am |
491 |
+--- a/xlators/playground/template/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
492 |
++++ b/xlators/playground/template/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
493 |
+@@ -1,7 +1,7 @@ |
494 |
+ xlator_LTLIBRARIES = template.la |
495 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features |
496 |
+ |
497 |
+-template_la_LDFLAGS = -module -avoid-version |
498 |
++template_la_LDFLAGS = -module -avoid-version -shared |
499 |
+ |
500 |
+ template_la_SOURCES = template.c |
501 |
+ template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
502 |
+diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am |
503 |
+--- a/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
504 |
++++ b/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
505 |
+@@ -1,7 +1,7 @@ |
506 |
+ auth_LTLIBRARIES = addr.la |
507 |
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth |
508 |
+ |
509 |
+-addr_la_LDFLAGS = -module -avoid-version |
510 |
++addr_la_LDFLAGS = -module -avoid-version -shared |
511 |
+ |
512 |
+ addr_la_SOURCES = addr.c |
513 |
+ addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
514 |
+diff -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am |
515 |
+--- a/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
516 |
++++ b/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
517 |
+@@ -1,7 +1,7 @@ |
518 |
+ auth_LTLIBRARIES = login.la |
519 |
+ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth |
520 |
+ |
521 |
+-login_la_LDFLAGS = -module -avoid-version |
522 |
++login_la_LDFLAGS = -module -avoid-version -shared |
523 |
+ |
524 |
+ login_la_SOURCES = login.c |
525 |
+ login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
526 |
+diff -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am |
527 |
+--- a/xlators/protocol/client/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
528 |
++++ b/xlators/protocol/client/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
529 |
+@@ -2,7 +2,7 @@ |
530 |
+ xlator_LTLIBRARIES = client.la |
531 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol |
532 |
+ |
533 |
+-client_la_LDFLAGS = -module -avoid-version |
534 |
++client_la_LDFLAGS = -module -avoid-version -shared |
535 |
+ |
536 |
+ client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ |
537 |
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ |
538 |
+diff -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am |
539 |
+--- a/xlators/protocol/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 |
540 |
++++ b/xlators/protocol/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
541 |
+@@ -1,7 +1,7 @@ |
542 |
+ xlator_LTLIBRARIES = server.la |
543 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol |
544 |
+ |
545 |
+-server_la_LDFLAGS = -module -avoid-version |
546 |
++server_la_LDFLAGS = -module -avoid-version -shared |
547 |
+ |
548 |
+ server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ |
549 |
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ |
550 |
+diff -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am |
551 |
+--- a/xlators/storage/bd/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
552 |
++++ b/xlators/storage/bd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
553 |
+@@ -2,7 +2,7 @@ |
554 |
+ xlator_LTLIBRARIES = bd.la |
555 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage |
556 |
+ |
557 |
+-bd_la_LDFLAGS = -module -avoid-version |
558 |
++bd_la_LDFLAGS = -module -avoid-version -shared |
559 |
+ LIBBD = -llvm2app -lrt |
560 |
+ bd_la_SOURCES = bd.c bd-helper.c bd-aio.c |
561 |
+ bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO) |
562 |
+diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am |
563 |
+--- a/xlators/storage/posix/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
564 |
++++ b/xlators/storage/posix/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
565 |
+@@ -2,7 +2,7 @@ |
566 |
+ xlator_LTLIBRARIES = posix.la |
567 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage |
568 |
+ |
569 |
+-posix_la_LDFLAGS = -module -avoid-version |
570 |
++posix_la_LDFLAGS = -module -avoid-version -shared |
571 |
+ |
572 |
+ posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c |
573 |
+ posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO) |
574 |
+diff -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am |
575 |
+--- a/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 |
576 |
++++ b/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 |
577 |
+@@ -1,6 +1,6 @@ |
578 |
+ xlator_LTLIBRARIES = posix-acl.la |
579 |
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system |
580 |
+-posix_acl_la_LDFLAGS = -module -avoid-version |
581 |
++posix_acl_la_LDFLAGS = -module -avoid-version -shared |
582 |
+ posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c |
583 |
+ posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la |
584 |
+ |
585 |
|
586 |
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild |
587 |
deleted file mode 100644 |
588 |
index ffd564e..0000000 |
589 |
--- a/sys-cluster/glusterfs/glusterfs-3.2.7.ebuild |
590 |
+++ /dev/null |
591 |
@@ -1,122 +0,0 @@ |
592 |
-# Copyright 1999-2014 Gentoo Foundation |
593 |
-# Distributed under the terms of the GNU General Public License v2 |
594 |
-# $Id$ |
595 |
- |
596 |
-EAPI=4 |
597 |
- |
598 |
-PYTHON_DEPEND="2" |
599 |
-inherit autotools elisp-common eutils multilib python versionator |
600 |
- |
601 |
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" |
602 |
-HOMEPAGE="http://www.gluster.org/" |
603 |
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" |
604 |
- |
605 |
-LICENSE="AGPL-3" |
606 |
-SLOT="0" |
607 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
608 |
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax" |
609 |
- |
610 |
-RDEPEND="emacs? ( virtual/emacs ) |
611 |
- fuse? ( >=sys-fs/fuse-2.7.0 ) |
612 |
- infiniband? ( sys-infiniband/libibverbs )" |
613 |
-DEPEND="${RDEPEND} |
614 |
- virtual/pkgconfig |
615 |
- sys-devel/bison |
616 |
- sys-devel/flex" |
617 |
- |
618 |
-SITEFILE="50${PN}-mode-gentoo.el" |
619 |
- |
620 |
-pkg_setup() { |
621 |
- python_set_active_version 2 |
622 |
- python_pkg_setup |
623 |
-} |
624 |
- |
625 |
-src_prepare() { |
626 |
- epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \ |
627 |
- "${FILESDIR}/${PN}-docdir.patch" \ |
628 |
- "${FILESDIR}/glusterd-3.2.0-workdir.patch" |
629 |
- sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die |
630 |
- eautoreconf |
631 |
-} |
632 |
- |
633 |
-src_configure() { |
634 |
- econf \ |
635 |
- $(use_enable fuse fuse-client) \ |
636 |
- $(use_enable infiniband ibverbs) \ |
637 |
- $(use_enable static-libs static) \ |
638 |
- --enable-georeplication \ |
639 |
- --disable-bdb \ |
640 |
- --docdir=/usr/share/doc/${PF} \ |
641 |
- --localstatedir=/var |
642 |
-} |
643 |
- |
644 |
-src_compile() { |
645 |
- emake |
646 |
- if use emacs ; then |
647 |
- elisp-compile extras/glusterfs-mode.el || die |
648 |
- fi |
649 |
-} |
650 |
- |
651 |
-src_install() { |
652 |
- emake DESTDIR="${D}" install |
653 |
- |
654 |
- if use emacs ; then |
655 |
- elisp-install ${PN} extras/glusterfs-mode.el* || die |
656 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
657 |
- fi |
658 |
- |
659 |
- if use vim-syntax ; then |
660 |
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" |
661 |
- insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim |
662 |
- fi |
663 |
- |
664 |
- if use extras ; then |
665 |
- newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize |
666 |
- newbin extras/backend-cleanup.sh glusterfs-backend-cleanup |
667 |
- newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute |
668 |
- newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync |
669 |
- fi |
670 |
- |
671 |
- dodoc AUTHORS ChangeLog NEWS README THANKS |
672 |
- |
673 |
- newinitd "${FILESDIR}/${PN}.initd" glusterfsd |
674 |
- newinitd "${FILESDIR}/glusterd.initd" glusterd |
675 |
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd |
676 |
- |
677 |
- keepdir /var/log/${PN} |
678 |
- keepdir /var/lib/glusterd |
679 |
- |
680 |
- python_convert_shebangs -r 2 "${ED}" |
681 |
-} |
682 |
- |
683 |
-pkg_postinst() { |
684 |
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
685 |
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
686 |
- elog " /etc/init.d/glusterd start" |
687 |
- elog |
688 |
- elog "For static configurations, the glusterfsd startup script can be multiplexed." |
689 |
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" |
690 |
- elog "separate service. To create additional instances of the glusterfsd service" |
691 |
- elog "simply create a symlink to the glusterfsd startup script." |
692 |
- elog |
693 |
- elog "Example:" |
694 |
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" |
695 |
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" |
696 |
- elog "You can now treat glusterfsd2 like any other service" |
697 |
- elog |
698 |
- ewarn "You need to use a ntp client to keep the clocks synchronized across all" |
699 |
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to" |
700 |
- ewarn "run GlusterFS." |
701 |
- |
702 |
- if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then |
703 |
- elog |
704 |
- elog "You are upgrading from a previous version of ${PN}, please read:" |
705 |
- elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide" |
706 |
- fi |
707 |
- |
708 |
- use emacs && elisp-site-regen |
709 |
-} |
710 |
- |
711 |
-pkg_postrm() { |
712 |
- use emacs && elisp-site-regen |
713 |
-} |
714 |
|
715 |
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild |
716 |
deleted file mode 100644 |
717 |
index fd8b7dd..0000000 |
718 |
--- a/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild |
719 |
+++ /dev/null |
720 |
@@ -1,135 +0,0 @@ |
721 |
-# Copyright 1999-2014 Gentoo Foundation |
722 |
-# Distributed under the terms of the GNU General Public License v2 |
723 |
-# $Id$ |
724 |
- |
725 |
-EAPI=4 |
726 |
- |
727 |
-PYTHON_DEPEND="2" |
728 |
-AUTOTOOLS_AUTORECONF=1 |
729 |
- |
730 |
-inherit autotools-utils elisp-common eutils multilib python versionator |
731 |
- |
732 |
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" |
733 |
-HOMEPAGE="http://www.gluster.org/" |
734 |
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" |
735 |
- |
736 |
-LICENSE="AGPL-3" |
737 |
-SLOT="0" |
738 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
739 |
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax" |
740 |
- |
741 |
-RDEPEND="emacs? ( virtual/emacs ) |
742 |
- fuse? ( >=sys-fs/fuse-2.7.0 ) |
743 |
- infiniband? ( sys-infiniband/libibverbs )" |
744 |
-DEPEND="${RDEPEND} |
745 |
- virtual/pkgconfig |
746 |
- sys-devel/bison |
747 |
- sys-devel/flex" |
748 |
- |
749 |
-SITEFILE="50${PN}-mode-gentoo.el" |
750 |
- |
751 |
-PATCHES=( |
752 |
- "${FILESDIR}/${PN}-3.3.0-parallel-build.patch" |
753 |
- "${FILESDIR}/${PN}-3.3.0-docdir.patch" |
754 |
- "${FILESDIR}/${PN}-3.3.0-silent_rules.patch" |
755 |
- "${FILESDIR}/${PN}-3.3.0-avoid-version.patch" |
756 |
-) |
757 |
- |
758 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS ) |
759 |
- |
760 |
-pkg_setup() { |
761 |
- python_set_active_version 2 |
762 |
- python_pkg_setup |
763 |
-} |
764 |
- |
765 |
-src_prepare() { |
766 |
- sed -e "s/ -ggdb3//g" \ |
767 |
- -i argp-standalone/configure.ac || die |
768 |
- sed -e "s:\$(PYTHON):${PREFIX}/usr/bin/python2:g" \ |
769 |
- -i xlators/features/marker/utils/src/Makefile.am || die #446330 |
770 |
- sed -e 's:"/usr/local/libexec/glusterfs:GSYNCD_PREFIX":' \ |
771 |
- -i xlators/mgmt/glusterd/src/glusterd.c || die #464196 |
772 |
- autotools-utils_src_prepare |
773 |
- cd argp-standalone && eautoreconf |
774 |
-} |
775 |
- |
776 |
-src_configure() { |
777 |
- local myeconfargs=( |
778 |
- --disable-dependency-tracking |
779 |
- --disable-silent-rules |
780 |
- $(use_enable fuse fuse-client) |
781 |
- $(use_enable infiniband ibverbs) |
782 |
- $(use_enable static-libs static) |
783 |
- --enable-georeplication |
784 |
- --docdir=/usr/share/doc/${PF} |
785 |
- --localstatedir=/var |
786 |
- ) |
787 |
- autotools-utils_src_configure |
788 |
-} |
789 |
- |
790 |
-src_compile() { |
791 |
- autotools-utils_src_compile |
792 |
- if use emacs ; then |
793 |
- elisp-compile extras/glusterfs-mode.el || die |
794 |
- fi |
795 |
-} |
796 |
- |
797 |
-src_install() { |
798 |
- autotools-utils_src_install |
799 |
- |
800 |
- if use emacs ; then |
801 |
- elisp-install ${PN} extras/glusterfs-mode.el* || die |
802 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
803 |
- fi |
804 |
- |
805 |
- if use vim-syntax ; then |
806 |
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim |
807 |
- insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim |
808 |
- fi |
809 |
- |
810 |
- if use extras ; then |
811 |
- newbin extras/backend-xattr-sanitize.sh ${PN}-backend-xattr-sanitize |
812 |
- newbin extras/backend-cleanup.sh ${PN}-backend-cleanup |
813 |
- newbin extras/migrate-unify-to-distribute.sh ${PN}-migrate-unify-to-distribute |
814 |
- newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync |
815 |
- fi |
816 |
- |
817 |
- newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd |
818 |
- newinitd "${FILESDIR}/glusterd.initd" glusterd |
819 |
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd |
820 |
- |
821 |
- keepdir /var/log/${PN} |
822 |
- keepdir /var/lib/glusterd |
823 |
- |
824 |
- python_convert_shebangs -r 2 "${ED}" |
825 |
-} |
826 |
- |
827 |
-pkg_postinst() { |
828 |
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" |
829 |
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:" |
830 |
- elog " /etc/init.d/glusterd start" |
831 |
- elog |
832 |
- elog "For static configurations, the glusterfsd startup script can be multiplexed." |
833 |
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" |
834 |
- elog "separate service. To create additional instances of the glusterfsd service" |
835 |
- elog "simply create a symlink to the glusterfsd startup script." |
836 |
- elog |
837 |
- elog "Example:" |
838 |
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" |
839 |
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" |
840 |
- elog "You can now treat glusterfsd2 like any other service" |
841 |
- elog |
842 |
- ewarn "You need to use a ntp client to keep the clocks synchronized across all" |
843 |
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to" |
844 |
- ewarn "run GlusterFS." |
845 |
- |
846 |
- elog |
847 |
- elog "You are upgrading from a previous version of ${PN}, please read:" |
848 |
- elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/" |
849 |
- |
850 |
- use emacs && elisp-site-regen |
851 |
-} |
852 |
- |
853 |
-pkg_postrm() { |
854 |
- use emacs && elisp-site-regen |
855 |
-} |
856 |
|
857 |
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild |
858 |
similarity index 96% |
859 |
copy from sys-cluster/glusterfs/glusterfs-3.5.3.ebuild |
860 |
copy to sys-cluster/glusterfs/glusterfs-3.5.4.ebuild |
861 |
index e818b41..ad162ac 100644 |
862 |
--- a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild |
863 |
+++ b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild |
864 |
@@ -57,6 +57,14 @@ pkg_setup() { |
865 |
( use georeplication || use glupy ) && python-single-r1_pkg_setup |
866 |
} |
867 |
|
868 |
+src_prepare() { |
869 |
+ autotools-utils_src_prepare |
870 |
+ |
871 |
+ # argp-standalone source dir is not clean... |
872 |
+ cd argp-standalone |
873 |
+ emake distclean |
874 |
+} |
875 |
+ |
876 |
src_configure() { |
877 |
local myeconfargs=( |
878 |
--disable-dependency-tracking |
879 |
@@ -139,6 +147,7 @@ src_install() { |
880 |
|
881 |
# QA |
882 |
rm -rf "${ED}/var/run/" || die |
883 |
+ use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete |
884 |
|
885 |
use georeplication && python_fix_shebang "${ED}" |
886 |
} |
887 |
|
888 |
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild |
889 |
similarity index 95% |
890 |
rename from sys-cluster/glusterfs/glusterfs-3.5.3.ebuild |
891 |
rename to sys-cluster/glusterfs/glusterfs-3.6.5.ebuild |
892 |
index e818b41..5015ae8 100644 |
893 |
--- a/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild |
894 |
+++ b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild |
895 |
@@ -43,7 +43,7 @@ SITEFILE="50${PN}-mode-gentoo.el" |
896 |
PATCHES=( |
897 |
"${FILESDIR}/${PN}-3.4.0-silent_rules.patch" |
898 |
"${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch" |
899 |
- "${FILESDIR}/${PN}-3.5.1-build-shared-only.patch" |
900 |
+ "${FILESDIR}/${PN}-3.6.5-build-shared-only.patch" |
901 |
) |
902 |
|
903 |
DOCS=( AUTHORS ChangeLog NEWS README THANKS ) |
904 |
@@ -57,6 +57,14 @@ pkg_setup() { |
905 |
( use georeplication || use glupy ) && python-single-r1_pkg_setup |
906 |
} |
907 |
|
908 |
+src_prepare() { |
909 |
+ autotools-utils_src_prepare |
910 |
+ |
911 |
+ # contrib/argp-standalone source dir is not clean... |
912 |
+ cd contrib/argp-standalone |
913 |
+ emake distclean |
914 |
+} |
915 |
+ |
916 |
src_configure() { |
917 |
local myeconfargs=( |
918 |
--disable-dependency-tracking |
919 |
@@ -139,6 +147,7 @@ src_install() { |
920 |
|
921 |
# QA |
922 |
rm -rf "${ED}/var/run/" || die |
923 |
+ use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete |
924 |
|
925 |
use georeplication && python_fix_shebang "${ED}" |
926 |
} |