Pullup ticket #6708 - requested by taca lang/ruby27-base: security fix Revisions pulled up: - lang/ruby/rubyversion.mk 1.258 - lang/ruby27-base/distinfo 1.11 - lang/ruby27-base/patches/patch-configure 1.3 --- Module Name: pkgsrc Committed By: taca Date: Sat Nov 26 13:09:59 UTC 2022 Modified Files: pkgsrc/lang/ruby: rubyversion.mk pkgsrc/lang/ruby27-base: distinfo pkgsrc/lang/ruby27-base/patches: patch-configure Log Message: lang/ruby27-base: update to 2.7.7 Ruby 2.7.7 Released (2022-11-24) Ruby 2.7.7 has been released. This release includes a security fix. Please check the topics below for details. * CVE-2021-33621: HTTP response splitting in CGI This release also includes some build problem fixes. They are not considered to affect compatibility with previous versions. See the commit logs for further details.diff -r1.252.4.2 -r1.252.4.3 pkgsrc/lang/ruby/rubyversion.mk
(bsiegert)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: rubyversion.mk,v 1.252.4.2 2022/11/30 17:25:42 bsiegert Exp $ | 1 | # $NetBSD: rubyversion.mk,v 1.252.4.3 2022/11/30 17:37:35 bsiegert Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | # This file determines which Ruby version is used as a dependency for | 4 | # This file determines which Ruby version is used as a dependency for | |
5 | # a package. | 5 | # a package. | |
6 | # | 6 | # | |
7 | # | 7 | # | |
8 | # === User-settable variables === | 8 | # === User-settable variables === | |
9 | # | 9 | # | |
10 | # RUBY_VERSION_DEFAULT | 10 | # RUBY_VERSION_DEFAULT | |
11 | # The preferred Ruby version to use. | 11 | # The preferred Ruby version to use. | |
12 | # | 12 | # | |
13 | # Possible values: 26 27 30 31 | 13 | # Possible values: 26 27 30 31 | |
14 | # Default: 27 | 14 | # Default: 27 | |
@@ -204,27 +204,27 @@ | @@ -204,27 +204,27 @@ | |||
204 | _RUBYVERSION_MK= # defined | 204 | _RUBYVERSION_MK= # defined | |
205 | 205 | |||
206 | .include "../../mk/bsd.prefs.mk" | 206 | .include "../../mk/bsd.prefs.mk" | |
207 | 207 | |||
208 | .if defined(PKGNAME_REQD) | 208 | .if defined(PKGNAME_REQD) | |
209 | . if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) | 209 | . if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*) | |
210 | _RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} | 210 | _RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} | |
211 | RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} | 211 | RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/} | |
212 | . endif | 212 | . endif | |
213 | .endif | 213 | .endif | |
214 | 214 | |||
215 | # current supported Ruby's version | 215 | # current supported Ruby's version | |
216 | RUBY26_VERSION= 2.6.10 | 216 | RUBY26_VERSION= 2.6.10 | |
217 | RUBY27_VERSION= 2.7.6 | 217 | RUBY27_VERSION= 2.7.7 | |
218 | RUBY30_VERSION= 3.0.5 | 218 | RUBY30_VERSION= 3.0.5 | |
219 | RUBY31_VERSION= 3.1.3 | 219 | RUBY31_VERSION= 3.1.3 | |
220 | 220 | |||
221 | # current API compatible version; used for version of shared library | 221 | # current API compatible version; used for version of shared library | |
222 | RUBY26_API_VERSION= 2.6.0 | 222 | RUBY26_API_VERSION= 2.6.0 | |
223 | RUBY27_API_VERSION= 2.7.0 | 223 | RUBY27_API_VERSION= 2.7.0 | |
224 | RUBY30_API_VERSION= 3.0.0 | 224 | RUBY30_API_VERSION= 3.0.0 | |
225 | RUBY31_API_VERSION= 3.1.0 | 225 | RUBY31_API_VERSION= 3.1.0 | |
226 | 226 | |||
227 | # | 227 | # | |
228 | RUBY_VERSION_DEFAULT?= 27 | 228 | RUBY_VERSION_DEFAULT?= 27 | |
229 | 229 | |||
230 | # supported Ruby's version | 230 | # supported Ruby's version | |
@@ -321,52 +321,52 @@ RUBY_WEBRICK_VER= 1.4.4 | @@ -321,52 +321,52 @@ RUBY_WEBRICK_VER= 1.4.4 | |||
321 | RUBY_XMLRPC_VER= 0.3.0 | 321 | RUBY_XMLRPC_VER= 0.3.0 | |
322 | RUBY_ZLIB_VER= 1.0.0 | 322 | RUBY_ZLIB_VER= 1.0.0 | |
323 | 323 | |||
324 | .elif ${RUBY_VER} == "27" | 324 | .elif ${RUBY_VER} == "27" | |
325 | RUBY_VERSION= ${RUBY27_VERSION} | 325 | RUBY_VERSION= ${RUBY27_VERSION} | |
326 | RUBY_ABI_VERSION= ${RUBY_VERSION} | 326 | RUBY_ABI_VERSION= ${RUBY_VERSION} | |
327 | RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} | 327 | RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} | |
328 | 328 | |||
329 | # bundled gems | 329 | # bundled gems | |
330 | RUBY_RUBYGEMS_VER= 3.1.6 | 330 | RUBY_RUBYGEMS_VER= 3.1.6 | |
331 | RUBY_BENCHMARK_VER= 0.1.0 | 331 | RUBY_BENCHMARK_VER= 0.1.0 | |
332 | RUBY_BIGDECIMAL_VER= 2.0.0 | 332 | RUBY_BIGDECIMAL_VER= 2.0.0 | |
333 | RUBY_BUNDLER_VER= 2.1.4 | 333 | RUBY_BUNDLER_VER= 2.1.4 | |
334 | RUBY_CGI_VER= 0.1.0.1 | 334 | RUBY_CGI_VER= 0.1.0.2 | |
335 | RUBY_CSV_VER= 3.1.2 | 335 | RUBY_CSV_VER= 3.1.2 | |
336 | RUBY_DATE_VER= 3.0.3 | 336 | RUBY_DATE_VER= 3.0.3 | |
337 | RUBY_DBM_VER= 1.1.0 | 337 | RUBY_DBM_VER= 1.1.0 | |
338 | RUBY_DELEGATE_VER= 0.1.0 | 338 | RUBY_DELEGATE_VER= 0.1.0 | |
339 | RUBY_DID_YOU_MEAN_VER= 1.4.0 | 339 | RUBY_DID_YOU_MEAN_VER= 1.4.0 | |
340 | RUBY_ETC_VER= 1.1.0 | 340 | RUBY_ETC_VER= 1.1.0 | |
341 | RUBY_FCNTL_VER= 1.0.0 | 341 | RUBY_FCNTL_VER= 1.0.0 | |
342 | RUBY_FIDDLE_VER= 1.0.0 | 342 | RUBY_FIDDLE_VER= 1.0.0 | |
343 | RUBY_FILEUTILS_VER= 1.4.1 | 343 | RUBY_FILEUTILS_VER= 1.4.1 | |
344 | RUBY_FORWARDABLE_VER= 1.3.1 | 344 | RUBY_FORWARDABLE_VER= 1.3.1 | |
345 | RUBY_GETOPTLONG_VER= 0.1.0 | 345 | RUBY_GETOPTLONG_VER= 0.1.0 | |
346 | RUBY_IO_CONSOLE_VER= 0.5.6 | 346 | RUBY_IO_CONSOLE_VER= 0.5.6 | |
347 | RUBY_IPADDR_VER= 1.2.2 | 347 | RUBY_IPADDR_VER= 1.2.2 | |
348 | RUBY_IRB_VER= 1.2.6 | 348 | RUBY_IRB_VER= 1.2.6 | |
349 | RUBY_JSON_VER= 2.3.0 | 349 | RUBY_JSON_VER= 2.3.0 | |
350 | RUBY_LOGGER_VER= 1.4.2 | 350 | RUBY_LOGGER_VER= 1.4.2 | |
351 | RUBY_MATRIX_VER= 0.2.0 | 351 | RUBY_MATRIX_VER= 0.2.0 | |
352 | RUBY_MINITEST_VER= 5.13.0 | 352 | RUBY_MINITEST_VER= 5.13.0 | |
353 | RUBY_MUTEX_M_VER= 0.1.0 | 353 | RUBY_MUTEX_M_VER= 0.1.0 | |
354 | RUBY_NET_POP_VER= 0.1.0 | 354 | RUBY_NET_POP_VER= 0.1.0 | |
355 | RUBY_NET_SMTP_VER= 0.1.0 | 355 | RUBY_NET_SMTP_VER= 0.1.0 | |
356 | RUBY_NET_TELNET_VER= 0.2.0 | 356 | RUBY_NET_TELNET_VER= 0.2.0 | |
357 | RUBY_OBSERVER_VER= 0.1.0 | 357 | RUBY_OBSERVER_VER= 0.1.0 | |
358 | RUBY_OPEN3_VER= 0.1.0 | 358 | RUBY_OPEN3_VER= 0.1.0 | |
359 | RUBY_OPENSSL_VER= 2.1.3 | 359 | RUBY_OPENSSL_VER= 2.1.4 | |
360 | RUBY_OSTRUCT_VER= 0.2.0 | 360 | RUBY_OSTRUCT_VER= 0.2.0 | |
361 | RUBY_POWER_ASSERT_VER= 1.1.7 | 361 | RUBY_POWER_ASSERT_VER= 1.1.7 | |
362 | RUBY_PRIME_VER= 0.1.1 | 362 | RUBY_PRIME_VER= 0.1.1 | |
363 | RUBY_PSTORE_VER= 0.1.0 | 363 | RUBY_PSTORE_VER= 0.1.0 | |
364 | RUBY_PSYCH_VER= 3.1.0 | 364 | RUBY_PSYCH_VER= 3.1.0 | |
365 | RUBY_RACC_VER= 1.4.16 | 365 | RUBY_RACC_VER= 1.4.16 | |
366 | RUBY_RAKE_VER= 13.0.1 | 366 | RUBY_RAKE_VER= 13.0.1 | |
367 | RUBY_RDOC_VER= 6.2.1.1 | 367 | RUBY_RDOC_VER= 6.2.1.1 | |
368 | RUBY_READLINE_VER= 0.0.2 | 368 | RUBY_READLINE_VER= 0.0.2 | |
369 | RUBY_RELINE_VER= 0.1.5 | 369 | RUBY_RELINE_VER= 0.1.5 | |
370 | RUBY_REXML_VER= 3.2.3.1 | 370 | RUBY_REXML_VER= 3.2.3.1 | |
371 | RUBY_RSS_VER= 0.2.8 | 371 | RUBY_RSS_VER= 0.2.8 | |
372 | RUBY_SDBM_VER= 1.0.0 | 372 | RUBY_SDBM_VER= 1.0.0 |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2022/04/12 14:21:00 taca Exp $ | 1 | $NetBSD: distinfo,v 1.10.4.1 2022/11/30 17:37:36 bsiegert Exp $ | |
2 | 2 | |||
3 | BLAKE2s (ruby-2.7.6.tar.xz) = 4cc99a73c925a1652758b41769e06a1a4c8bd9e7cb0da7ffe5ece6e8b132e920 | 3 | BLAKE2s (ruby-2.7.7.tar.xz) = 4dc4c991e5799b1a67fcb18d73ddc4a43aafa1564eac9f8879698f9fb59a53ef | |
4 | SHA512 (ruby-2.7.6.tar.xz) = e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f | 4 | SHA512 (ruby-2.7.7.tar.xz) = a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683 | |
5 | Size (ruby-2.7.6.tar.xz) = 12084408 bytes | 5 | Size (ruby-2.7.7.tar.xz) = 12101804 bytes | |
6 | SHA1 (patch-configure) = 5ee800f6824b18efd06e56a659235ea784819f2e | 6 | SHA1 (patch-configure) = 6f4b2abb5d22270ebcf211b4aa25d7efb6c0d2e9 | |
7 | SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b | 7 | SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b | |
8 | SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 925fa135abb90b9a1fa16da14b17c0d2b2bec364 | 8 | SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 925fa135abb90b9a1fa16da14b17c0d2b2bec364 | |
9 | SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335 | 9 | SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335 | |
10 | SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a | 10 | SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a | |
11 | SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 | 11 | SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 | |
12 | SHA1 (patch-lib_rubygems.rb) = 6f5ff6ca504c38ec3a521027dc4df8fa9d6683c3 | 12 | SHA1 (patch-lib_rubygems.rb) = 6f5ff6ca504c38ec3a521027dc4df8fa9d6683c3 | |
13 | SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad | 13 | SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad | |
14 | SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d | 14 | SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d | |
15 | SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 | 15 | SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 | |
16 | SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3 | 16 | SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3 | |
17 | SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa | 17 | SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa | |
18 | SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278 | 18 | SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278 | |
19 | SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab | 19 | SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab |
@@ -1,122 +1,135 @@ | @@ -1,122 +1,135 @@ | |||
1 | $NetBSD: patch-configure,v 1.2 2021/04/11 12:32:03 taca Exp $ | 1 | $NetBSD: patch-configure,v 1.2.12.1 2022/11/30 17:37:36 bsiegert Exp $ | |
2 | 2 | |||
3 | * Adding Interix support. | 3 | * Adding Interix support. | |
4 | * Ignore doxygen. | 4 | * Ignore doxygen. | |
5 | * Ignore VCS. | 5 | * Ignore VCS. | |
6 | * Handle SSP in pkgsrc. | 6 | * Handle SSP in pkgsrc. | |
7 | * Put -std= in CFLAGS not CPPFLAGS. | 7 | * Put -std= in CFLAGS not CPPFLAGS. | |
8 | 8 | |||
9 | --- configure.orig 2021-04-05 12:39:40.000000000 +0000 | 9 | --- configure.orig 2022-11-24 12:42:10.000000000 +0000 | |
10 | +++ configure | 10 | +++ configure | |
11 | @@ -6469,7 +6469,7 @@ else | 11 | @@ -7709,7 +7709,7 @@ else $as_nop | |
12 | if test x"$target_alias" = x; then : | 12 | then : | |
13 | 13 | |||
14 | case "$target_os" in #( | 14 | case "$target_os" in #( | |
15 | - darwin*) : | 15 | - darwin*) : | |
16 | + nodarwin*) : | 16 | + nodarwin*) : | |
17 | 17 | |||
18 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 | 18 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 | |
19 | $as_echo_n "checking for real target cpu... " >&6; } | 19 | printf %s "checking for real target cpu... " >&6; } | |
20 | @@ -8839,6 +8839,7 @@ fi | 20 | @@ -10064,6 +10064,7 @@ fi | |
21 | stack_protector=no | 21 | stack_protector=no | |
22 | ;; #( | 22 | ;; #( | |
23 | *) : | 23 | *) : | |
24 | + stack_protector=no | 24 | + stack_protector=no | |
25 | ;; | 25 | ;; | |
26 | esac | 26 | esac | |
27 | if test -z "${stack_protector+set}"; then : | 27 | if test -z "${stack_protector+set}" | |
28 | @@ -10703,6 +10704,10 @@ esac | 28 | @@ -12017,6 +12018,10 @@ esac | |
29 | 29 | |||
30 | ac_cv_func___builtin_setjmp=no | 30 | ac_cv_func___builtin_setjmp=no | |
31 | ;; #( | 31 | ;; #( | |
32 | + interix*) : | 32 | + interix*) : | |
33 | + LIBS="-lm $LIBS" | 33 | + LIBS="-lm $LIBS" | |
34 | + ac_cv_func_getpgrp_void=yes | 34 | + ac_cv_func_getpgrp_void=yes | |
35 | + ;; #( | 35 | + ;; #( | |
36 | *) : | 36 | *) : | |
37 | ;; | 37 | ;; | |
38 | esac | 38 | esac | |
39 | @@ -22277,6 +22282,8 @@ else | 39 | @@ -23748,7 +23753,9 @@ else | |
40 | # ifdef _MSC_VER | 40 | #include <stdlib.h> | |
41 | # include <malloc.h> | 41 | #include <stddef.h> | |
42 | # define alloca _alloca | 42 | #ifndef alloca | |
43 | +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) | 43 | -# ifdef __GNUC__ | |
44 | +# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) | |||
44 | +# include <stdlib.h> | 45 | +# include <stdlib.h> | |
45 | # else | 46 | +# elif defined __GNUC__ | |
46 | # ifdef HAVE_ALLOCA_H | 47 | # define alloca __builtin_alloca | |
47 | # include <alloca.h> | 48 | # elif defined _MSC_VER | |
48 | @@ -27482,7 +27489,9 @@ fi | 49 | # include <malloc.h> | |
50 | @@ -28604,7 +28611,9 @@ fi | |||
49 | interix*) : | 51 | interix*) : | |
50 | : ${LDSHARED='$(CC) -shared'} | 52 | : ${LDSHARED='$(CC) -shared'} | |
51 | XLDFLAGS="$XLDFLAGS -Wl,-E" | 53 | XLDFLAGS="$XLDFLAGS -Wl,-E" | |
52 | + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' | 54 | + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' | |
53 | LIBPATHFLAG=" -L%1\$-s" | 55 | LIBPATHFLAG=" -L%1\$-s" | |
54 | + RPATHFLAG=' -Wl,-R%1$-s' | 56 | + RPATHFLAG=' -Wl,-R%1$-s' | |
55 | rb_cv_dlopen=yes ;; #( | 57 | rb_cv_dlopen=yes ;; #( | |
56 | freebsd*|dragonfly*) : | 58 | freebsd*|dragonfly*) : | |
57 | 59 | |||
58 | @@ -28743,7 +28752,7 @@ fi | 60 | @@ -28775,7 +28784,7 @@ fi | |
61 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5 | |||
62 | printf %s "checking whether $flag is accepted for bundle... " >&6; } | |||
63 | : > conftest.c | |||
64 | - if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && | |||
65 | + if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && | |||
66 | test ! -s conftest.err | |||
67 | then : | |||
68 | ||||
69 | @@ -29929,7 +29938,7 @@ fi | |||
59 | ;; #( | 70 | ;; #( | |
60 | freebsd*|dragonfly*) : | 71 | freebsd*|dragonfly*) : | |
61 | 72 | |||
62 | - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' | 73 | - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' | |
63 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' | 74 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' | |
64 | LIBRUBY_SONAME='$(LIBRUBY_SO)' | 75 | LIBRUBY_SONAME='$(LIBRUBY_SO)' | |
65 | if test "$rb_cv_binary_elf" != "yes" ; then : | 76 | if test "$rb_cv_binary_elf" != "yes" | |
66 | 77 | then : | ||
67 | @@ -28822,9 +28831,10 @@ esac | 78 | @@ -30010,9 +30019,10 @@ esac | |
68 | ;; #( | 79 | ;; #( | |
69 | darwin*) : | 80 | darwin*) : | |
70 | 81 | |||
71 | + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' | 82 | + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' | |
72 | LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' | 83 | LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' | |
73 | - LIBRUBY_SONAME='$(LIBRUBY_SO)' | 84 | - LIBRUBY_SONAME='$(LIBRUBY_SO)' | |
74 | - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' | 85 | - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' | |
75 | + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' | 86 | + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' | |
76 | + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' | 87 | + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' | |
77 | if test "$load_relative" = yes; then : | 88 | if test "$load_relative" = yes | |
89 | then : | |||
78 | 90 | |||
79 | libprefix="@executable_path/../${libdir_basename}" | 91 | @@ -30035,7 +30045,12 @@ fi | |
80 | @@ -28845,7 +28855,12 @@ fi | |||
81 | ;; #( | 92 | ;; #( | |
82 | interix*) : | 93 | interix*) : | |
83 | 94 | |||
84 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' | 95 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' | |
85 | + SOLIBS='$(LIBS)' | 96 | + SOLIBS='$(LIBS)' | |
86 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' | 97 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' | |
87 | + # link explicitly to 0x48000000 | 98 | + # link explicitly to 0x48000000 | |
88 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' | 99 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' | |
89 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' | 100 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' | |
90 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' | 101 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' | |
91 | ;; #( | 102 | ;; #( | |
92 | mingw*|cygwin*|mswin*) : | 103 | mingw*|cygwin*|mswin*) : | |
93 | 104 | |||
94 | @@ -29027,7 +29042,7 @@ if test "$enable_rpath" = yes; then : | 105 | @@ -30228,7 +30243,7 @@ then : | |
95 | esac | 106 | esac | |
96 | rpathflag=`IFS="$PATH_SEPARATOR" | 107 | rpathflag=`IFS="$PATH_SEPARATOR" | |
97 | echo x "$rpathflag" | | 108 | echo x "$rpathflag" | | |
98 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" | 109 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" | |
99 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" | 110 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" | |
100 | ` | 111 | ` | |
101 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" | 112 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" | |
102 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" | 113 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" | |
103 | @@ -31751,19 +31766,7 @@ which seems to be undefined. Please mak | 114 | @@ -33031,21 +33046,7 @@ which seems to be undefined. Please mak | |
104 | "Makefile":F) | 115 | "Makefile":F) | |
105 | tmpmk=confmk$$.tmp | 116 | tmpmk=confmk$$.tmp | |
106 | { | 117 | { | |
107 | - if test ${VCS+set}; then : | 118 | - if test ${VCS+set} | |
119 | -then : | |||
108 | - | 120 | - | |
109 | - : | 121 | - : | |
110 | - | 122 | - | |
111 | -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : | 123 | -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` | |
124 | -then : | |||
112 | - | 125 | - | |
113 | - VCS='$(GIT)' | 126 | - VCS='$(GIT)' | |
114 | - | 127 | - | |
115 | -else | 128 | -else $as_nop | |
116 | - | 129 | - | |
117 | VCS='echo cannot' | 130 | VCS='echo cannot' | |
118 | - | 131 | - | |
119 | -fi | 132 | -fi | |
120 | case "$VCS" in #( | 133 | case "$VCS" in #( | |
121 | '$(GIT)'|git) : | 134 | '$(GIT)'|git) : | |
122 | VCSUP='$(VCS) pull $(GITPULLOPTIONS)' ;; #( | 135 | VCSUP='$(VCS) pull $(GITPULLOPTIONS)' ;; #( |