@@ -228,42 +228,17 @@ dep_get ()
228
228
popd || return 1
229
229
}
230
230
231
- # add '--disable-docs' to libffi ./configure so makeinfo isn't needed
232
- # https://github.com/libffi/libffi/pull/190/commits/fa7a257113e2cfc963a0be9dca5d7b4c73999dcc
233
- libffi_patch_disable_docs ()
231
+ libffi_autoreconf_patch ()
234
232
{
235
- cat << 'EOF ' > Makefile.am.patch
236
- 56c56,59
237
- < info_TEXINFOS = doc/libffi.texi
238
- ---
239
- > info_TEXINFOS =
240
- > if BUILD_DOCS
241
- > #info_TEXINFOS += doc/libffi.texi
242
- > endif
243
- EOF
244
-
245
233
# autogen.sh is not happy when run from some directories, causing it
246
- # to create an ltmain.sh file in our ${jm_root} directory. weird.
234
+ # to create an ltmain.sh file in our ${jm_root} directory. weird.
247
235
# https://github.com/meetecho/janus-gateway/issues/290#issuecomment-125160739
248
236
# https://github.com/meetecho/janus-gateway/commit/ac38cfdae7185f9061569b14809af4d4052da700
249
237
cat << 'EOF ' > autoreconf.patch
250
238
18a19
251
239
> AC_CONFIG_AUX_DIR([.])
252
240
EOF
253
-
254
- cat << 'EOF ' > configure.ac.patch
255
- 545a546,552
256
- > AC_ARG_ENABLE(docs,
257
- > AC_HELP_STRING([--disable-docs],
258
- > [Disable building of docs (default: no)]),
259
- > [enable_docs=no],
260
- > [enable_docs=yes])
261
- > AM_CONDITIONAL(BUILD_DOCS, [test x$enable_docs = xyes])
262
- >
263
- EOF
264
- patch Makefile.am Makefile.am.patch
265
241
patch configure.ac autoreconf.patch
266
- patch configure.ac configure.ac.patch
267
242
}
268
243
269
244
libffi_build ()
@@ -279,9 +254,9 @@ libffi_build ()
279
254
280
255
libffi_install ()
281
256
{
282
- libffi_version=' libffi-3.2.1 '
283
- libffi_lib_tar=" v3.2.1 .tar.gz"
284
- libffi_lib_sha=' 96d08dee6f262beea1a18ac9a3801f64018dc4521895e9198d029d6850febe23 '
257
+ libffi_version=' libffi-3.4.6 '
258
+ libffi_lib_tar=" v3.4.6 .tar.gz"
259
+ libffi_lib_sha=' 9ac790464c1eb2f5ab5809e978a1683e9393131aede72d1b0a0703771d3c6cda '
285
260
libffi_url=" https://github.com/libffi/libffi/archive"
286
261
287
262
if check_skip_build " ${libffi_version} " ; then
@@ -291,7 +266,7 @@ libffi_install ()
291
266
return 1
292
267
fi
293
268
pushd " ${libffi_version} " || return 1
294
- if ! libffi_patch_disable_docs ; then
269
+ if ! libffi_autoreconf_patch ; then
295
270
return 1
296
271
fi
297
272
if libffi_build; then
0 commit comments