Disable CPU detection on Darwin, the result for 32-bit (i486) is incompatible with pkgsrc MACHINE_ARCH (i386). Fixes 32-bit build, no change for 64-bit.diff -r1.42 -r1.43 pkgsrc/lang/ruby193-base/distinfo
(jperkin)
@@ -1,47 +1,47 @@ | @@ -1,47 +1,47 @@ | |||
1 | $NetBSD: distinfo,v 1.42 2015/03/08 14:53:39 taca Exp $ | 1 | $NetBSD: distinfo,v 1.43 2015/04/03 08:59:08 jperkin Exp $ | |
2 | 2 | |||
3 | SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535 | 3 | SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535 | |
4 | RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01 | 4 | RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01 | |
5 | Size (ruby-1.9.3-p551.tar.bz2) = 10049332 bytes | 5 | Size (ruby-1.9.3-p551.tar.bz2) = 10049332 bytes | |
6 | SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b | 6 | SHA1 (patch-configure) = 1ee484ad481734a49824a1a1f8bb5f8f96f6606a | |
7 | SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3 | 7 | SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3 | |
8 | SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 | 8 | SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 | |
9 | SHA1 (patch-ext_dbm_extconf.rb) = cc16af8f4999ef6c54c9652e2748504c31e5ef4e | 9 | SHA1 (patch-ext_dbm_extconf.rb) = cc16af8f4999ef6c54c9652e2748504c31e5ef4e | |
10 | SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4 | 10 | SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4 | |
11 | SHA1 (patch-ext_tk_extconf.rb) = 7cda490107ce8d23644152feeade8a8cf21d9898 | 11 | SHA1 (patch-ext_tk_extconf.rb) = 7cda490107ce8d23644152feeade8a8cf21d9898 | |
12 | SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb | 12 | SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb | |
13 | SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 | 13 | SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 | |
14 | SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 | 14 | SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 | |
15 | SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = c7b946dd8d37014d9cd43ce787fbb560a21cce2e | 15 | SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = c7b946dd8d37014d9cd43ce787fbb560a21cce2e | |
16 | SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = 4e429b8775f9a079e5338d58db7520179566c4b7 | 16 | SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = 4e429b8775f9a079e5338d58db7520179566c4b7 | |
17 | SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf | 17 | SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf | |
18 | SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416 | 18 | SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416 | |
19 | SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef | 19 | SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef | |
20 | SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890 | 20 | SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890 | |
21 | SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 | 21 | SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 | |
22 | SHA1 (patch-lib_rdoc_text.rb) = cfbf48096ce14da8016177f6a8e6ef4416929647 | 22 | SHA1 (patch-lib_rdoc_text.rb) = cfbf48096ce14da8016177f6a8e6ef4416929647 | |
23 | SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd | 23 | SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd | |
24 | SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77 | 24 | SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77 | |
25 | SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e | 25 | SHA1 (patch-lib_rubygems_command__manager.rb) = 4fabf9a6c8bf5e47a4fb3bb3d398105b4452ec7e | |
26 | SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 | 26 | SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 | |
27 | SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 | 27 | SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 | |
28 | SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc | 28 | SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc | |
29 | SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 | 29 | SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 | |
30 | SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c | 30 | SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c | |
31 | SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 | 31 | SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 | |
32 | SHA1 (patch-lib_rubygems_dependency__installer.rb) = 8832e6d0157191b1c137ad7ad7ba5429bcfadd5a | 32 | SHA1 (patch-lib_rubygems_dependency__installer.rb) = 8832e6d0157191b1c137ad7ad7ba5429bcfadd5a | |
33 | SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 | 33 | SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 | |
34 | SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73 | 34 | SHA1 (patch-lib_rubygems_gem__runner.rb) = 03ff2f0b72004ef7e09b5ba9d56752109e4e6b73 | |
35 | SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 | 35 | SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 | |
36 | SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc | 36 | SHA1 (patch-lib_rubygems_installer.rb) = fe1c97abaf0b7a3fbecf8327a6d1ccd697cb62cc | |
37 | SHA1 (patch-lib_rubygems_platform.rb) = af6ceaea50c0ccdf0539f79eb25d2afef7c05e73 | 37 | SHA1 (patch-lib_rubygems_platform.rb) = af6ceaea50c0ccdf0539f79eb25d2afef7c05e73 | |
38 | SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779 | 38 | SHA1 (patch-lib_rubygems_specification.rb) = 3da23596f701c1966bc12f2341c82f2f2c646779 | |
39 | SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e | 39 | SHA1 (patch-lib_rubygems_uninstaller.rb) = 038df207f0ad4ef674ff60976fcda969d50c3c4e | |
40 | SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1 | 40 | SHA1 (patch-man_erb.1) = a8f69ebb02b4d5e1c80b270a3d683c23d8dfbcf1 | |
41 | SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e | 41 | SHA1 (patch-man_irb.1) = 58fcccbb5f5f76450715cbf246a018af58d9b57e | |
42 | SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64 | 42 | SHA1 (patch-man_ri.1) = 25d82d08a9eb74ccc1cbbc1fc324d23f1a56ed64 | |
43 | SHA1 (patch-man_ruby.1) = 43c638a38bed8257f33d8f5a491acd77a18032b7 | 43 | SHA1 (patch-man_ruby.1) = 43c638a38bed8257f33d8f5a491acd77a18032b7 | |
44 | SHA1 (patch-pack.c) = d1e2c9871d2ba012a9136bdf708c2d42588d863c | 44 | SHA1 (patch-pack.c) = d1e2c9871d2ba012a9136bdf708c2d42588d863c | |
45 | SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24 | 45 | SHA1 (patch-test_rubygems_test__gem.rb) = fe8b8e436b255595122d2a01462ba0a686575f24 | |
46 | SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff | 46 | SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff | |
47 | SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa | 47 | SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa |
@@ -1,124 +1,133 @@ | @@ -1,124 +1,133 @@ | |||
1 | $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $ | 1 | $NetBSD: patch-configure,v 1.12 2015/04/03 08:59:08 jperkin Exp $ | |
2 | 2 | |||
3 | * Adding Interix and MirBSD support. | 3 | * Adding Interix and MirBSD support. | |
4 | * Ignore doxygen. | 4 | * Ignore doxygen. | |
5 | 5 | |||
6 | --- configure.orig 2013-11-22 04:24:15.000000000 +0000 | 6 | --- configure.orig 2014-11-13 13:42:20.000000000 +0000 | |
7 | +++ configure | 7 | +++ configure | |
8 | @@ -10741,6 +10741,9 @@ esac | 8 | @@ -4666,7 +4666,7 @@ esac | |
9 | else | |||
10 | if test x"$target_alias" = x; then | |||
11 | case "$target_os" in #( | |||
12 | - darwin*) : | |||
13 | + notdarwin*) : | |||
14 | ||||
15 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 | |||
16 | $as_echo_n "checking for real target cpu... " >&6; } | |||
17 | @@ -10900,6 +10900,9 @@ esac | |||
9 | superux*) : | 18 | superux*) : | |
10 | ac_cv_func_setitimer=no | 19 | ac_cv_func_setitimer=no | |
11 | ;; #( | 20 | ;; #( | |
12 | + interix*) : | 21 | + interix*) : | |
13 | + LIBS="-lm $LIBS" | 22 | + LIBS="-lm $LIBS" | |
14 | + ac_cv_func_getpgrp_void=yes ;; #( | 23 | + ac_cv_func_getpgrp_void=yes ;; #( | |
15 | *) : | 24 | *) : | |
16 | LIBS="-lm $LIBS" ;; | 25 | LIBS="-lm $LIBS" ;; | |
17 | esac | 26 | esac | |
18 | @@ -11344,7 +11347,13 @@ for ac_header in limits.h sys/file.h sys | 27 | @@ -11503,7 +11506,13 @@ for ac_header in limits.h sys/file.h sys | |
19 | net/socket.h sys/socket.h process.h atomic.h | 28 | net/socket.h sys/socket.h process.h atomic.h | |
20 | do : | 29 | do : | |
21 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 30 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
22 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | 31 | -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | |
23 | +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " | 32 | +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " | |
24 | +#include <sys/types.h> | 33 | +#include <sys/types.h> | |
25 | +#ifdef HAVE_SYS_TIME_H | 34 | +#ifdef HAVE_SYS_TIME_H | |
26 | +#include <sys/time.h> | 35 | +#include <sys/time.h> | |
27 | +#endif | 36 | +#endif | |
28 | + | 37 | + | |
29 | +" | 38 | +" | |
30 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | 39 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : | |
31 | cat >>confdefs.h <<_ACEOF | 40 | cat >>confdefs.h <<_ACEOF | |
32 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 41 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | |
33 | @@ -12089,6 +12098,9 @@ fi | 42 | @@ -12248,6 +12257,9 @@ fi | |
34 | ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H | 43 | ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H | |
35 | #include <time.h> | 44 | #include <time.h> | |
36 | #endif | 45 | #endif | |
37 | +#ifdef HAVE_SYS_TIME_H | 46 | +#ifdef HAVE_SYS_TIME_H | |
38 | +# include <sys/time.h> | 47 | +# include <sys/time.h> | |
39 | +#endif | 48 | +#endif | |
40 | " | 49 | " | |
41 | if test "x$ac_cv_type_struct_timespec" = xyes; then : | 50 | if test "x$ac_cv_type_struct_timespec" = xyes; then : | |
42 | 51 | |||
43 | @@ -13880,6 +13892,8 @@ else | 52 | @@ -14039,6 +14051,8 @@ else | |
44 | # ifdef _MSC_VER | 53 | # ifdef _MSC_VER | |
45 | # include <malloc.h> | 54 | # include <malloc.h> | |
46 | # define alloca _alloca | 55 | # define alloca _alloca | |
47 | +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) | 56 | +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) | |
48 | +# include <stdlib.h> | 57 | +# include <stdlib.h> | |
49 | # else | 58 | # else | |
50 | # ifdef HAVE_ALLOCA_H | 59 | # ifdef HAVE_ALLOCA_H | |
51 | # include <alloca.h> | 60 | # include <alloca.h> | |
52 | @@ -15832,7 +15846,7 @@ done | 61 | @@ -15991,7 +16005,7 @@ done | |
53 | MAINLIBS="-pthread $MAINLIBS" ;; #( | 62 | MAINLIBS="-pthread $MAINLIBS" ;; #( | |
54 | *) : | 63 | *) : | |
55 | case "$target_os" in #( | 64 | case "$target_os" in #( | |
56 | - openbsd*) : | 65 | - openbsd*) : | |
57 | + openbsd*|mirbsd*) : | 66 | + openbsd*|mirbsd*) : | |
58 | LIBS="-pthread $LIBS" ;; #( | 67 | LIBS="-pthread $LIBS" ;; #( | |
59 | *) : | 68 | *) : | |
60 | LIBS="-l$pthread_lib $LIBS" ;; | 69 | LIBS="-l$pthread_lib $LIBS" ;; | |
61 | @@ -16282,7 +16296,9 @@ esac ;; #( | 70 | @@ -16441,7 +16455,9 @@ esac ;; #( | |
62 | interix*) : | 71 | interix*) : | |
63 | : ${LDSHARED='$(CC) -shared'} | 72 | : ${LDSHARED='$(CC) -shared'} | |
64 | XLDFLAGS="$XLDFLAGS -Wl,-E" | 73 | XLDFLAGS="$XLDFLAGS -Wl,-E" | |
65 | + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' | 74 | + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' | |
66 | LIBPATHFLAG=" -L%1\$-s" | 75 | LIBPATHFLAG=" -L%1\$-s" | |
67 | + RPATHFLAG=' -Wl,-R%1$-s' | 76 | + RPATHFLAG=' -Wl,-R%1$-s' | |
68 | rb_cv_dlopen=yes ;; #( | 77 | rb_cv_dlopen=yes ;; #( | |
69 | freebsd*|dragonfly*) : | 78 | freebsd*|dragonfly*) : | |
70 | 79 | |||
71 | @@ -16294,7 +16310,7 @@ esac ;; #( | 80 | @@ -16453,7 +16469,7 @@ esac ;; #( | |
72 | test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" | 81 | test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" | |
73 | fi | 82 | fi | |
74 | rb_cv_dlopen=yes ;; #( | 83 | rb_cv_dlopen=yes ;; #( | |
75 | - openbsd*) : | 84 | - openbsd*) : | |
76 | + openbsd*|mirbsd*) : | 85 | + openbsd*|mirbsd*) : | |
77 | : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} | 86 | : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} | |
78 | if test "$rb_cv_binary_elf" = yes; then | 87 | if test "$rb_cv_binary_elf" = yes; then | |
79 | LDFLAGS="$LDFLAGS -Wl,-E" | 88 | LDFLAGS="$LDFLAGS -Wl,-E" | |
80 | @@ -16825,7 +16841,7 @@ _ACEOF | 89 | @@ -16984,7 +17000,7 @@ _ACEOF | |
81 | freebsd*|dragonfly*) : | 90 | freebsd*|dragonfly*) : | |
82 | 91 | |||
83 | SOLIBS='$(LIBS)' | 92 | SOLIBS='$(LIBS)' | |
84 | - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' | 93 | - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' | |
85 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' | 94 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' | |
86 | if test "$rb_cv_binary_elf" != "yes" ; then | 95 | if test "$rb_cv_binary_elf" != "yes" ; then | |
87 | LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" | 96 | LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" | |
88 | LIBRUBY_ALIASES='' | 97 | LIBRUBY_ALIASES='' | |
89 | @@ -16842,7 +16858,7 @@ _ACEOF | 98 | @@ -17001,7 +17017,7 @@ _ACEOF | |
90 | LIBRUBY_ALIASES="" | 99 | LIBRUBY_ALIASES="" | |
91 | fi | 100 | fi | |
92 | ;; #( | 101 | ;; #( | |
93 | - openbsd*) : | 102 | - openbsd*) : | |
94 | + openbsd*|mirbsd*) : | 103 | + openbsd*|mirbsd*) : | |
95 | 104 | |||
96 | SOLIBS='$(LIBS)' | 105 | SOLIBS='$(LIBS)' | |
97 | LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` | 106 | LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` | |
98 | @@ -16903,7 +16919,12 @@ esac | 107 | @@ -17062,7 +17078,12 @@ esac | |
99 | ;; #( | 108 | ;; #( | |
100 | interix*) : | 109 | interix*) : | |
101 | 110 | |||
102 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' | 111 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' | |
103 | + SOLIBS='$(LIBS)' | 112 | + SOLIBS='$(LIBS)' | |
104 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' | 113 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' | |
105 | + # link explicitly to 0x48000000 | 114 | + # link explicitly to 0x48000000 | |
106 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' | 115 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' | |
107 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' | 116 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' | |
108 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' | 117 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' | |
109 | ;; #( | 118 | ;; #( | |
110 | *) : | 119 | *) : | |
111 | ;; | 120 | ;; | |
112 | @@ -16966,11 +16987,7 @@ if test "$install_doc" != no; then | 121 | @@ -17125,11 +17146,7 @@ if test "$install_doc" != no; then | |
113 | else | 122 | else | |
114 | RDOCTARGET="nodoc" | 123 | RDOCTARGET="nodoc" | |
115 | fi | 124 | fi | |
116 | - if test "$install_capi" != no -a -n "$DOXYGEN"; then | 125 | - if test "$install_capi" != no -a -n "$DOXYGEN"; then | |
117 | - CAPITARGET="capi" | 126 | - CAPITARGET="capi" | |
118 | - else | 127 | - else | |
119 | - CAPITARGET="nodoc" | 128 | - CAPITARGET="nodoc" | |
120 | - fi | 129 | - fi | |
121 | + CAPITARGET="nodoc" | 130 | + CAPITARGET="nodoc" | |
122 | else | 131 | else | |
123 | RDOCTARGET="nodoc" | 132 | RDOCTARGET="nodoc" | |
124 | CAPITARGET="nodoc" | 133 | CAPITARGET="nodoc" |