@@ -27,7 +27,6 @@ mod_dubbo_ver="1.0.2"
27
27
apisix_nginx_module_ver=" 1.16.3"
28
28
wasm_nginx_module_ver=" 0.6.5"
29
29
lua_var_nginx_module_ver=" v0.5.3"
30
- grpc_client_nginx_module_ver=" v0.4.4"
31
30
lua_resty_events_ver=" 0.2.0"
32
31
33
32
@@ -130,14 +129,6 @@ else
130
129
lua-var-nginx-module-${lua_var_nginx_module_ver}
131
130
fi
132
131
133
- if [ " $repo " == grpc-client-nginx-module ]; then
134
- cp -r " $prev_workdir " ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
135
- else
136
- git clone --depth=1 -b $grpc_client_nginx_module_ver \
137
- https://github.com/api7/grpc-client-nginx-module \
138
- grpc-client-nginx-module-${grpc_client_nginx_module_ver}
139
- fi
140
-
141
132
cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
142
133
./patch.sh ../openresty-${OPENRESTY_VERSION}
143
134
cd ..
@@ -152,9 +143,6 @@ cd ..
152
143
153
144
luajit_xcflags=${luajit_xcflags:= " -DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" }
154
145
no_pool_patch=${no_pool_patch:- }
155
- # TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
156
- # version of grpc-client-nginx-module
157
- grpc_engine_path=" -DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX /libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX /libgrpc_engine.so"
158
146
159
147
cd openresty-${OPENRESTY_VERSION} || exit 1
160
148
181
169
182
170
183
171
./configure --prefix=" $OR_PREFIX " \
184
- --with-cc-opt=" -DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $ cc_opt" \
172
+ --with-cc-opt=" -DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt " \
185
173
--with-ld-opt=" -Wl,-rpath,$OR_PREFIX /wasmtime-c-api/lib $ld_opt " \
186
174
$debug_args \
187
175
--add-module=../mod_dubbo-${mod_dubbo_ver} \
191
179
--add-module=../apisix-nginx-module-${apisix_nginx_module_ver} /src/meta \
192
180
--add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
193
181
--add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
194
- --add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
195
182
--add-module=../lua-resty-events-${lua_resty_events_ver} \
196
183
--with-poll_module \
197
184
--with-pcre-jit \
223
210
$no_pool_patch \
224
211
-j` nproc`
225
212
213
+ # ref: https://github.com/api7/grpc-client-nginx-module/pull/34
214
+ # After loading Go code from .so, the signalfd doesn't work anymore
215
+ sed -i " s/#ifndef NGX_HTTP_LUA_HAVE_SIGNALFD/#ifdef NGX_HTTP_LUA_HAVE_SIGNALFD/" $( find -name ' ngx_auto_config.h' )
216
+
226
217
make -j` nproc`
227
218
sudo make install
228
219
cd ..
@@ -242,10 +233,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
242
233
sudo OPENRESTY_PREFIX=" $OR_PREFIX " make install
243
234
cd ..
244
235
245
- cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
246
- sudo OPENRESTY_PREFIX=" $OR_PREFIX " make install
247
- cd ..
248
-
249
236
# package etcdctl
250
237
ETCD_ARCH=" amd64"
251
238
ETCD_VERSION=${ETCD_VERSION:- ' 3.5.4' }
0 commit comments