| @@ -1,23 +1,24 @@ | | | @@ -1,23 +1,24 @@ |
| 1 | $NetBSD: patch-configure,v 1.1 2023/01/21 13:51:23 taca Exp $ | | 1 | $NetBSD: patch-configure,v 1.2 2023/02/04 12:10:26 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | * Avoid bash specific variable substitution. | | 3 | * Avoid bash specific variable substitution. |
| 4 | * Adding Interix support. | | 4 | * Adding Interix support. |
| 5 | * Ignore doxygen. | | 5 | * Ignore doxygen. |
| 6 | * Ignore VCS. | | 6 | * Ignore VCS. |
| 7 | * Handle SSP in pkgsrc. | | 7 | * Handle SSP in pkgsrc. |
| 8 | * Retain _XOPEN_SOURCE, fixes eventmachine. | | 8 | * Retain _XOPEN_SOURCE, fixes eventmachine. |
| 9 | * Fix argument for pthread_self() on NetBSD. | | 9 | * Fix argument for pthread_self() on NetBSD. |
| 10 | * Explictly stop display with color. | | 10 | * Explictly stop display with color. |
| | | 11 | * Remove bogus MJIT disabling on SunOS. |
| 11 | | | 12 | |
| 12 | --- configure.orig 2022-12-25 06:55:27.000000000 +0000 | | 13 | --- configure.orig 2022-12-25 06:55:27.000000000 +0000 |
| 13 | +++ configure | | 14 | +++ configure |
| 14 | @@ -8666,7 +8666,7 @@ else $as_nop | | 15 | @@ -8666,7 +8666,7 @@ else $as_nop |
| 15 | then : | | 16 | then : |
| 16 | | | 17 | |
| 17 | case "$target_os" in #( | | 18 | case "$target_os" in #( |
| 18 | - darwin*) : | | 19 | - darwin*) : |
| 19 | + nodarwin*) : | | 20 | + nodarwin*) : |
| 20 | | | 21 | |
| 21 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 | | 22 | { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 |
| 22 | printf %s "checking for real target cpu... " >&6; } | | 23 | printf %s "checking for real target cpu... " >&6; } |
| 23 | @@ -10720,6 +10720,7 @@ fi | | 24 | @@ -10720,6 +10720,7 @@ fi |
| @@ -116,36 +117,45 @@ $NetBSD: patch-configure,v 1.1 2023/01/2 | | | @@ -116,36 +117,45 @@ $NetBSD: patch-configure,v 1.1 2023/01/2 |
| 116 | + 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' |
| 117 | ;; #( | | 118 | ;; #( |
| 118 | cygwin*|msys*|mingw*|mswin*) : | | 119 | cygwin*|msys*|mingw*|mswin*) : |
| 119 | | | 120 | |
| 120 | @@ -31950,7 +31955,7 @@ then : | | 121 | @@ -31950,7 +31955,7 @@ then : |
| 121 | esac | | 122 | esac |
| 122 | rpathflag=`IFS="$PATH_SEPARATOR" | | 123 | rpathflag=`IFS="$PATH_SEPARATOR" |
| 123 | echo x "$rpathflag" | | | 124 | echo x "$rpathflag" | |
| 124 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" | | 125 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" |
| 125 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" | | 126 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" |
| 126 | ` | | 127 | ` |
| 127 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" | | 128 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" |
| 128 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" | | 129 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" |
| | | 130 | @@ -32603,7 +32608,7 @@ then : |
| | | 131 | enableval=$enable_jit_support; MJIT_SUPPORT=$enableval |
| | | 132 | else $as_nop |
| | | 133 | case "$target_os" in #( |
| | | 134 | - wasi | mingw* | solaris*) : |
| | | 135 | + wasi | mingw*) : |
| | | 136 | MJIT_SUPPORT=no ;; #( |
| | | 137 | *) : |
| | | 138 | MJIT_SUPPORT=yes |
| 129 | @@ -33885,7 +33890,7 @@ guard=INCLUDE_RUBY_CONFIG_H | | 139 | @@ -33885,7 +33890,7 @@ guard=INCLUDE_RUBY_CONFIG_H |
| 130 | ( | | 140 | ( |
| 131 | if test "x$CONFIGURE_TTY" = xyes | | 141 | if test "x$CONFIGURE_TTY" = xyes |
| 132 | then : | | 142 | then : |
| 133 | - color=--color | | 143 | - color=--color |
| 134 | + color=--color=never | | 144 | + color=--color=never |
| 135 | else $as_nop | | 145 | else $as_nop |
| 136 | color= | | 146 | color= |
| 137 | fi | | 147 | fi |
| 138 | @@ -35124,21 +35129,7 @@ which seems to be undefined. Please mak | | 148 | @@ -35124,21 +35131,7 @@ which seems to be undefined. Please mak |
| 139 | "Makefile":F) | | 149 | "Makefile":F) |
| 140 | tmpmk=confmk$$.tmp | | 150 | tmpmk=confmk$$.tmp |
| 141 | { | | 151 | { |
| 142 | - if test ${VCS+set} | | 152 | - if test ${VCS+set} |
| 143 | -then : | | 153 | -then : |
| 144 | - | | 154 | - |
| 145 | - : | | 155 | - : |
| 146 | - | | 156 | - |
| 147 | -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` | | 157 | -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` |
| 148 | -then : | | 158 | -then : |
| 149 | - | | 159 | - |
| 150 | - VCS='$(GIT)' | | 160 | - VCS='$(GIT)' |
| 151 | - | | 161 | - |