ffi 1.15.3 → 1.15.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 64acbe6068a72fc276ab3f25bc3819921a0ffe01a0d5e0e87ab32a89aeae32e6
4
- data.tar.gz: 5d7d19abdf7e0f071edf0ff6dfd01e061bcc5edebc7f28133f58dd83789cdc8c
3
+ metadata.gz: 0bcc7a331092d1e4b89f817ea0aa8b3f13a9e58d68df67d9a04a825c16ae65a9
4
+ data.tar.gz: 8d7e7bbb75e7f19235c7ef6b9e814b09141f8f46b15a248f86fbe95551f26e72
5
5
  SHA512:
6
- metadata.gz: 5b013541765cc7c9dc4fd14373eb47b1875ab36dab9e4044bb99cbc362932fc0a2ac2ef2d802e672304407187163c1a65246e8b5d82cdcb6ce1b2711e2995dcc
7
- data.tar.gz: 6f47e3a6521db25b2dac5b01b295e2831d87ded589dd14658edf7aaa82af51faba4be3fb0fd93fe41a693c6fc803ba3eb53466605cf682d33915c824a8440ec2
6
+ metadata.gz: 8bf963e42331b77650954eee5aca3c1b2a780bf27f31cf6d85ff048efac8f60b40e484a0883512df5f81c00ce04ba22382e813e71d074f35f9f539c6366b7aa9
7
+ data.tar.gz: b36841f7eda33b367c877d8e8b3480096582abc73ddbac2a278e33943a9cb3afff1cbc323e0b0fceac3c8ef86f5b4e6d1cbede107f09e9444910dd56bcfa5444
data/CHANGELOG.md CHANGED
@@ -1,3 +1,14 @@
1
+ 1.15.4 / 2021-09-01
2
+ -------------------
3
+
4
+ Fixed:
5
+ * Fix build for uClibc. #913
6
+ * Correct module lookup when including `ffi-module` gem. #912
7
+
8
+ Changed:
9
+ * Use ruby code of the ffi gem in JRuby-9.2.20+. #915
10
+
11
+
1
12
  1.15.3 / 2021-06-16
2
13
  -------------------
3
14
 
data/ext/ffi_c/Platform.c CHANGED
@@ -38,7 +38,7 @@
38
38
  #include "rbffi_endian.h"
39
39
  #include "Platform.h"
40
40
 
41
- #if defined(__GNU__) || defined(__GLIBC__)
41
+ #if defined(__GNU__) || (defined(__GLIBC__) && !defined(__UCLIBC__))
42
42
  # include <gnu/lib-names.h>
43
43
  #endif
44
44
 
@@ -71,7 +71,7 @@ rbffi_Platform_Init(VALUE moduleFFI)
71
71
  rb_define_const(PlatformModule, "BYTE_ORDER", INT2FIX(BYTE_ORDER));
72
72
  rb_define_const(PlatformModule, "LITTLE_ENDIAN", INT2FIX(LITTLE_ENDIAN));
73
73
  rb_define_const(PlatformModule, "BIG_ENDIAN", INT2FIX(BIG_ENDIAN));
74
- #if defined(__GNU__) || defined(__GLIBC__)
74
+ #if defined(__GNU__) || (defined(__GLIBC__) && !defined(__UCLIBC__))
75
75
  rb_define_const(PlatformModule, "GNU_LIBC", rb_str_new2(LIBC_SO));
76
76
  #endif
77
77
  export_primitive_types(PlatformModule);
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.16.3 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2018 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -305,8 +305,8 @@ am__recursive_targets = \
305
305
  $(am__extra_recursive_targets)
306
306
  AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
307
307
  cscope distdir distdir-am dist dist-all distcheck
308
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
309
- $(LISP)fficonfig.h.in
308
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
309
+ fficonfig.h.in
310
310
  # Read a list of newline-separated strings from the standard input,
311
311
  # and print each of them once, without duplicates. Input order is
312
312
  # *not* preserved.
@@ -368,6 +368,8 @@ am__relativize = \
368
368
  DIST_ARCHIVES = $(distdir).tar.gz
369
369
  GZIP_ENV = --best
370
370
  DIST_TARGETS = dist-gzip
371
+ # Exists only to be overridden by the user if desired.
372
+ AM_DISTCHECK_DVI_TARGET = dvi
371
373
  distuninstallcheck_listfiles = find . -type f -print
372
374
  am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
373
375
  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -1552,6 +1554,10 @@ dist-xz: distdir
1552
1554
  tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
1553
1555
  $(am__post_remove_distdir)
1554
1556
 
1557
+ dist-zstd: distdir
1558
+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
1559
+ $(am__post_remove_distdir)
1560
+
1555
1561
  dist-tarZ: distdir
1556
1562
  @echo WARNING: "Support for distribution archives compressed with" \
1557
1563
  "legacy program 'compress' is deprecated." >&2
@@ -1594,6 +1600,8 @@ distcheck: dist
1594
1600
  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
1595
1601
  *.zip*) \
1596
1602
  unzip $(distdir).zip ;;\
1603
+ *.tar.zst*) \
1604
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
1597
1605
  esac
1598
1606
  chmod -R a-w $(distdir)
1599
1607
  chmod u+w $(distdir)
@@ -1609,7 +1617,7 @@ distcheck: dist
1609
1617
  $(DISTCHECK_CONFIGURE_FLAGS) \
1610
1618
  --srcdir=../.. --prefix="$$dc_install_base" \
1611
1619
  && $(MAKE) $(AM_MAKEFLAGS) \
1612
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
1620
+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
1613
1621
  && $(MAKE) $(AM_MAKEFLAGS) check \
1614
1622
  && $(MAKE) $(AM_MAKEFLAGS) install \
1615
1623
  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -2022,20 +2030,21 @@ uninstall-am: uninstall-pkgconfigDATA uninstall-toolexeclibLTLIBRARIES
2022
2030
  clean-generic clean-libtool clean-noinstLTLIBRARIES \
2023
2031
  clean-toolexeclibLTLIBRARIES cscope cscopelist-am ctags \
2024
2032
  ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
2025
- dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
2026
- distclean distclean-compile distclean-generic distclean-hdr \
2027
- distclean-libtool distclean-tags distcleancheck distdir \
2028
- distuninstallcheck dvi dvi-am html html-am info info-am \
2029
- install install-am install-data install-data-am install-dvi \
2030
- install-dvi-am install-exec install-exec-am install-html \
2031
- install-html-am install-info install-info-am install-man \
2032
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
2033
- install-ps-am install-strip install-toolexeclibLTLIBRARIES \
2034
- installcheck installcheck-am installdirs installdirs-am \
2035
- maintainer-clean maintainer-clean-generic mostlyclean \
2036
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
2037
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
2038
- uninstall-pkgconfigDATA uninstall-toolexeclibLTLIBRARIES
2033
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \
2034
+ distcheck distclean distclean-compile distclean-generic \
2035
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
2036
+ distdir distuninstallcheck dvi dvi-am html html-am info \
2037
+ info-am install install-am install-data install-data-am \
2038
+ install-dvi install-dvi-am install-exec install-exec-am \
2039
+ install-html install-html-am install-info install-info-am \
2040
+ install-man install-pdf install-pdf-am install-pkgconfigDATA \
2041
+ install-ps install-ps-am install-strip \
2042
+ install-toolexeclibLTLIBRARIES installcheck installcheck-am \
2043
+ installdirs installdirs-am maintainer-clean \
2044
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
2045
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
2046
+ tags tags-am uninstall uninstall-am uninstall-pkgconfigDATA \
2047
+ uninstall-toolexeclibLTLIBRARIES
2039
2048
 
2040
2049
  .PRECIOUS: Makefile
2041
2050
 
@@ -3094,12 +3094,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
3094
3094
  program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
3095
3095
 
3096
3096
  if test x"${MISSING+set}" != xset; then
3097
- case $am_aux_dir in
3098
- *\ * | *\ *)
3099
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
3100
- *)
3101
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
3102
- esac
3097
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
3103
3098
  fi
3104
3099
  # Use eval to expand $SHELL
3105
3100
  if eval "$MISSING --is-lightweight"; then
@@ -21279,7 +21274,9 @@ $as_echo X/"$am_mf" |
21279
21274
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
21280
21275
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
21281
21276
  as_fn_error $? "Something went wrong bootstrapping makefile fragments
21282
- for automatic dependency tracking. Try re-running configure with the
21277
+ for automatic dependency tracking. If GNU make was not used, consider
21278
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
21279
+ necessary). You can also try re-running configure with the
21283
21280
  '--disable-dependency-tracking' option to at least be able to build
21284
21281
  the package (albeit without support for automatic dependency tracking).
21285
21282
  See \`config.log' for more details" "$LINENO" 5; }
@@ -21306,7 +21303,6 @@ See \`config.log' for more details" "$LINENO" 5; }
21306
21303
  cat <<_LT_EOF >> "$cfgfile"
21307
21304
  #! $SHELL
21308
21305
  # Generated automatically by $as_me ($PACKAGE) $VERSION
21309
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
21310
21306
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
21311
21307
 
21312
21308
  # Provide generalized library-building support services.
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.16.3 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2018 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.16.3 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2018 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -1,7 +1,7 @@
1
1
  #!/bin/sh
2
2
  # install - install a program, script, or datafile
3
3
 
4
- scriptversion=2018-03-11.20; # UTC
4
+ scriptversion=2020-11-14.01; # UTC
5
5
 
6
6
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
7
7
  # later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@ posix_mkdir=
69
69
  # Desired mode of installed file.
70
70
  mode=0755
71
71
 
72
+ # Create dirs (including intermediate dirs) using mode 755.
73
+ # This is like GNU 'install' as of coreutils 8.32 (2020).
74
+ mkdir_umask=22
75
+
76
+ backupsuffix=
72
77
  chgrpcmd=
73
78
  chmodcmd=$chmodprog
74
79
  chowncmd=
@@ -99,18 +104,28 @@ Options:
99
104
  --version display version info and exit.
100
105
 
101
106
  -c (ignored)
102
- -C install only if different (preserve the last data modification time)
107
+ -C install only if different (preserve data modification time)
103
108
  -d create directories instead of installing files.
104
109
  -g GROUP $chgrpprog installed files to GROUP.
105
110
  -m MODE $chmodprog installed files to MODE.
106
111
  -o USER $chownprog installed files to USER.
112
+ -p pass -p to $cpprog.
107
113
  -s $stripprog installed files.
114
+ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
108
115
  -t DIRECTORY install into DIRECTORY.
109
116
  -T report an error if DSTFILE is a directory.
110
117
 
111
118
  Environment variables override the default commands:
112
119
  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
113
120
  RMPROG STRIPPROG
121
+
122
+ By default, rm is invoked with -f; when overridden with RMPROG,
123
+ it's up to you to specify -f if you want it.
124
+
125
+ If -S is not specified, no backups are attempted.
126
+
127
+ Email bug reports to bug-automake@gnu.org.
128
+ Automake home page: https://www.gnu.org/software/automake/
114
129
  "
115
130
 
116
131
  while test $# -ne 0; do
@@ -137,8 +152,13 @@ while test $# -ne 0; do
137
152
  -o) chowncmd="$chownprog $2"
138
153
  shift;;
139
154
 
155
+ -p) cpprog="$cpprog -p";;
156
+
140
157
  -s) stripcmd=$stripprog;;
141
158
 
159
+ -S) backupsuffix="$2"
160
+ shift;;
161
+
142
162
  -t)
143
163
  is_target_a_directory=always
144
164
  dst_arg=$2
@@ -255,6 +275,10 @@ do
255
275
  dstdir=$dst
256
276
  test -d "$dstdir"
257
277
  dstdir_status=$?
278
+ # Don't chown directories that already exist.
279
+ if test $dstdir_status = 0; then
280
+ chowncmd=""
281
+ fi
258
282
  else
259
283
 
260
284
  # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -301,22 +325,6 @@ do
301
325
  if test $dstdir_status != 0; then
302
326
  case $posix_mkdir in
303
327
  '')
304
- # Create intermediate dirs using mode 755 as modified by the umask.
305
- # This is like FreeBSD 'install' as of 1997-10-28.
306
- umask=`umask`
307
- case $stripcmd.$umask in
308
- # Optimize common cases.
309
- *[2367][2367]) mkdir_umask=$umask;;
310
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
311
-
312
- *[0-7])
313
- mkdir_umask=`expr $umask + 22 \
314
- - $umask % 100 % 40 + $umask % 20 \
315
- - $umask % 10 % 4 + $umask % 2
316
- `;;
317
- *) mkdir_umask=$umask,go-w;;
318
- esac
319
-
320
328
  # With -d, create the new directory with the user-specified mode.
321
329
  # Otherwise, rely on $mkdir_umask.
322
330
  if test -n "$dir_arg"; then
@@ -326,52 +334,49 @@ do
326
334
  fi
327
335
 
328
336
  posix_mkdir=false
329
- case $umask in
330
- *[123567][0-7][0-7])
331
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
332
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
333
- ;;
334
- *)
335
- # Note that $RANDOM variable is not portable (e.g. dash); Use it
336
- # here however when possible just to lower collision chance.
337
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
338
-
339
- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
340
-
341
- # Because "mkdir -p" follows existing symlinks and we likely work
342
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
343
- # directory is successfully created first before we actually test
344
- # 'mkdir -p' feature.
345
- if (umask $mkdir_umask &&
346
- $mkdirprog $mkdir_mode "$tmpdir" &&
347
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
348
- then
349
- if test -z "$dir_arg" || {
350
- # Check for POSIX incompatibilities with -m.
351
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
352
- # other-writable bit of parent directory when it shouldn't.
353
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
354
- test_tmpdir="$tmpdir/a"
355
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
356
- case $ls_ld_tmpdir in
357
- d????-?r-*) different_mode=700;;
358
- d????-?--*) different_mode=755;;
359
- *) false;;
360
- esac &&
361
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
362
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
363
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
364
- }
365
- }
366
- then posix_mkdir=:
367
- fi
368
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
369
- else
370
- # Remove any dirs left behind by ancient mkdir implementations.
371
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
372
- fi
373
- trap '' 0;;
374
- esac;;
337
+ # The $RANDOM variable is not portable (e.g., dash). Use it
338
+ # here however when possible just to lower collision chance.
339
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
340
+
341
+ trap '
342
+ ret=$?
343
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
344
+ exit $ret
345
+ ' 0
346
+
347
+ # Because "mkdir -p" follows existing symlinks and we likely work
348
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
349
+ # directory is successfully created first before we actually test
350
+ # 'mkdir -p'.
351
+ if (umask $mkdir_umask &&
352
+ $mkdirprog $mkdir_mode "$tmpdir" &&
353
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
354
+ then
355
+ if test -z "$dir_arg" || {
356
+ # Check for POSIX incompatibilities with -m.
357
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
358
+ # other-writable bit of parent directory when it shouldn't.
359
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
360
+ test_tmpdir="$tmpdir/a"
361
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
362
+ case $ls_ld_tmpdir in
363
+ d????-?r-*) different_mode=700;;
364
+ d????-?--*) different_mode=755;;
365
+ *) false;;
366
+ esac &&
367
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
368
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
369
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
370
+ }
371
+ }
372
+ then posix_mkdir=:
373
+ fi
374
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
375
+ else
376
+ # Remove any dirs left behind by ancient mkdir implementations.
377
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
378
+ fi
379
+ trap '' 0;;
375
380
  esac
376
381
 
377
382
  if
@@ -382,7 +387,7 @@ do
382
387
  then :
383
388
  else
384
389
 
385
- # The umask is ridiculous, or mkdir does not conform to POSIX,
390
+ # mkdir does not conform to POSIX,
386
391
  # or it failed possibly due to a race condition. Create the
387
392
  # directory the slow way, step by step, checking for races as we go.
388
393
 
@@ -411,7 +416,7 @@ do
411
416
  prefixes=
412
417
  else
413
418
  if $posix_mkdir; then
414
- (umask=$mkdir_umask &&
419
+ (umask $mkdir_umask &&
415
420
  $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
416
421
  # Don't fail if two instances are running concurrently.
417
422
  test -d "$prefix" || exit 1
@@ -451,7 +456,18 @@ do
451
456
  trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
452
457
 
453
458
  # Copy the file name to the temp name.
454
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
459
+ (umask $cp_umask &&
460
+ { test -z "$stripcmd" || {
461
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
462
+ # which would cause strip to fail.
463
+ if test -z "$doit"; then
464
+ : >"$dsttmp" # No need to fork-exec 'touch'.
465
+ else
466
+ $doit touch "$dsttmp"
467
+ fi
468
+ }
469
+ } &&
470
+ $doit_exec $cpprog "$src" "$dsttmp") &&
455
471
 
456
472
  # and set any options; do chmod last to preserve setuid bits.
457
473
  #
@@ -477,6 +493,13 @@ do
477
493
  then
478
494
  rm -f "$dsttmp"
479
495
  else
496
+ # If $backupsuffix is set, and the file being installed
497
+ # already exists, attempt a backup. Don't worry if it fails,
498
+ # e.g., if mv doesn't support -f.
499
+ if test -n "$backupsuffix" && test -f "$dst"; then
500
+ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
501
+ fi
502
+
480
503
  # Rename the file to the real destination.
481
504
  $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
482
505
 
@@ -491,9 +514,9 @@ do
491
514
  # file should still install successfully.
492
515
  {
493
516
  test ! -f "$dst" ||
494
- $doit $rmcmd -f "$dst" 2>/dev/null ||
517
+ $doit $rmcmd "$dst" 2>/dev/null ||
495
518
  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
496
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
519
+ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
497
520
  } ||
498
521
  { echo "$0: cannot unlink or rename $dst" >&2
499
522
  (exit 1); exit 1
@@ -31,7 +31,7 @@
31
31
 
32
32
  PROGRAM=libtool
33
33
  PACKAGE=libtool
34
- VERSION="2.4.6 Debian-2.4.6-14"
34
+ VERSION="2.4.6 Debian-2.4.6-15"
35
35
  package_revision=2.4.6
36
36
 
37
37
 
@@ -2141,7 +2141,7 @@ include the following information:
2141
2141
  compiler: $LTCC
2142
2142
  compiler flags: $LTCFLAGS
2143
2143
  linker: $LD (gnu? $with_gnu_ld)
2144
- version: $progname $scriptversion Debian-2.4.6-14
2144
+ version: $progname $scriptversion Debian-2.4.6-15
2145
2145
  automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
2146
2146
  autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
2147
2147
 
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.16.3 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2018 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -3,7 +3,7 @@
3
3
 
4
4
  scriptversion=2018-03-07.03; # UTC
5
5
 
6
- # Copyright (C) 1996-2018 Free Software Foundation, Inc.
6
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
7
7
  # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8
8
 
9
9
  # This program is free software; you can redistribute it and/or modify
@@ -1,7 +1,7 @@
1
- # Makefile.in generated by automake 1.16.1 from Makefile.am.
1
+ # Makefile.in generated by automake 1.16.3 from Makefile.am.
2
2
  # @configure_input@
3
3
 
4
- # Copyright (C) 1994-2018 Free Software Foundation, Inc.
4
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
5
5
 
6
6
  # This Makefile.in is free software; the Free Software Foundation
7
7
  # gives unlimited permission to copy and/or distribute it,
@@ -463,7 +463,7 @@ site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
463
463
  @echo '# Do not edit here. If you wish to override these values' >>site.tmp
464
464
  @echo '# edit the last section' >>site.tmp
465
465
  @echo 'set srcdir "$(srcdir)"' >>site.tmp
466
- @echo "set objdir `pwd`" >>site.tmp
466
+ @echo "set objdir \"`pwd`\"" >>site.tmp
467
467
  @echo 'set build_alias "$(build_alias)"' >>site.tmp
468
468
  @echo 'set build_triplet $(build_triplet)' >>site.tmp
469
469
  @echo 'set host_alias "$(host_alias)"' >>site.tmp
data/ffi.gemspec CHANGED
@@ -39,5 +39,4 @@ Gem::Specification.new do |s|
39
39
  s.add_development_dependency 'rake-compiler', '~> 1.0'
40
40
  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
41
41
  s.add_development_dependency 'rspec', '~> 2.14.1'
42
- s.add_development_dependency 'rubygems-tasks', "~> 0.2.4"
43
42
  end
data/lib/ffi/library.rb CHANGED
@@ -84,7 +84,7 @@ module FFI
84
84
  # @raise {RuntimeError} if +mod+ is not a Module
85
85
  # Test if extended object is a Module. If not, raise RuntimeError.
86
86
  def self.extended(mod)
87
- raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(Module)
87
+ raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(::Module)
88
88
  end
89
89
 
90
90
 
data/lib/ffi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FFI
2
- VERSION = '1.15.3'
2
+ VERSION = '1.15.4'
3
3
  end
data/lib/ffi.rb CHANGED
@@ -7,7 +7,7 @@ if RUBY_ENGINE == 'ruby'
7
7
 
8
8
  require 'ffi/ffi'
9
9
 
10
- elsif RUBY_ENGINE == 'jruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [9, 3]) >= 0
10
+ elsif RUBY_ENGINE == 'jruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [9, 2, 20]) >= 0
11
11
  JRuby::Util.load_ext("org.jruby.ext.ffi.FFIService")
12
12
  require 'ffi/ffi'
13
13
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ffi
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.15.3
4
+ version: 1.15.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wayne Meissner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-16 00:00:00.000000000 Z
11
+ date: 2021-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -66,20 +66,6 @@ dependencies:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 2.14.1
69
- - !ruby/object:Gem::Dependency
70
- name: rubygems-tasks
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - "~>"
74
- - !ruby/object:Gem::Version
75
- version: 0.2.4
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "~>"
81
- - !ruby/object:Gem::Version
82
- version: 0.2.4
83
69
  description: Ruby FFI library
84
70
  email: wmeissner@gmail.com
85
71
  executables: []