| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | $NetBSD: patch-configure,v 1.3 2022/11/26 13:02:49 taca Exp $ | | 1 | $NetBSD: patch-configure,v 1.4 2022/12/05 11:47:03 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 | | | 11 | |
| 12 | --- configure.orig 2022-11-24 10:20:33.000000000 +0000 | | 12 | --- configure.orig 2022-11-24 10:20:33.000000000 +0000 |
| 13 | +++ configure | | 13 | +++ configure |
| 14 | @@ -3942,12 +3942,12 @@ case "$target_cpu-$target_os" in #( | | 14 | @@ -3942,12 +3942,12 @@ case "$target_cpu-$target_os" in #( |
| @@ -105,59 +105,72 @@ $NetBSD: patch-configure,v 1.3 2022/11/2 | | | @@ -105,59 +105,72 @@ $NetBSD: patch-configure,v 1.3 2022/11/2 |
| 105 | | | 105 | |
| 106 | @@ -31748,8 +31745,10 @@ fi | | 106 | @@ -31748,8 +31745,10 @@ fi |
| 107 | ;; #( | | 107 | ;; #( |
| 108 | freebsd*|dragonfly*) : | | 108 | freebsd*|dragonfly*) : |
| 109 | | | 109 | |
| 110 | + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' | | 110 | + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' |
| 111 | LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' | | 111 | LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' |
| 112 | - LIBRUBY_SONAME='$(LIBRUBY_SO)' | | 112 | - LIBRUBY_SONAME='$(LIBRUBY_SO)' |
| 113 | + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' | | 113 | + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' |
| 114 | + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' | | 114 | + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' |
| 115 | if test "$rb_cv_binary_elf" != "yes" | | 115 | if test "$rb_cv_binary_elf" != "yes" |
| 116 | then : | | 116 | then : |
| 117 | | | 117 | |
| 118 | @@ -31872,7 +31871,12 @@ fi | | 118 | @@ -31847,9 +31846,10 @@ esac |
| | | 119 | ;; #( |
| | | 120 | darwin*) : |
| | | 121 | |
| | | 122 | + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' |
| | | 123 | LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' |
| | | 124 | - LIBRUBY_SONAME='$(LIBRUBY_SO)' |
| | | 125 | - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' |
| | | 126 | + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' |
| | | 127 | + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' |
| | | 128 | if test "$load_relative" = yes |
| | | 129 | then : |
| | | 130 | |
| | | 131 | @@ -31872,7 +31872,12 @@ fi |
| 119 | ;; #( | | 132 | ;; #( |
| 120 | interix*) : | | 133 | interix*) : |
| 121 | | | 134 | |
| 122 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' | | 135 | - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' |
| 123 | + SOLIBS='$(LIBS)' | | 136 | + SOLIBS='$(LIBS)' |
| 124 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' | | 137 | + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' |
| 125 | + # link explicitly to 0x48000000 | | 138 | + # link explicitly to 0x48000000 |
| 126 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' | | 139 | + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' |
| 127 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' | | 140 | + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' |
| 128 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' | | 141 | + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' |
| 129 | ;; #( | | 142 | ;; #( |
| 130 | cygwin*|msys*|mingw*|mswin*) : | | 143 | cygwin*|msys*|mingw*|mswin*) : |
| 131 | | | 144 | |
| 132 | @@ -32065,7 +32069,7 @@ then : | | 145 | @@ -32065,7 +32070,7 @@ then : |
| 133 | esac | | 146 | esac |
| 134 | rpathflag=`IFS="$PATH_SEPARATOR" | | 147 | rpathflag=`IFS="$PATH_SEPARATOR" |
| 135 | echo x "$rpathflag" | | | 148 | echo x "$rpathflag" | |
| 136 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" | | 149 | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" |
| 137 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" | | 150 | + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" |
| 138 | ` | | 151 | ` |
| 139 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" | | 152 | LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" |
| 140 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" | | 153 | LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" |
| 141 | @@ -33706,7 +33710,7 @@ guard=INCLUDE_RUBY_CONFIG_H | | 154 | @@ -33706,7 +33711,7 @@ guard=INCLUDE_RUBY_CONFIG_H |
| 142 | ( | | 155 | ( |
| 143 | if test "x$CONFIGURE_TTY" = xyes | | 156 | if test "x$CONFIGURE_TTY" = xyes |
| 144 | then : | | 157 | then : |
| 145 | - color=--color | | 158 | - color=--color |
| 146 | + color=--color=never | | 159 | + color=--color=never |
| 147 | else $as_nop | | 160 | else $as_nop |
| 148 | color= | | 161 | color= |
| 149 | fi | | 162 | fi |
| 150 | @@ -34930,21 +34934,7 @@ which seems to be undefined. Please mak | | 163 | @@ -34930,21 +34935,7 @@ which seems to be undefined. Please mak |
| 151 | "Makefile":F) | | 164 | "Makefile":F) |
| 152 | tmpmk=confmk$$.tmp | | 165 | tmpmk=confmk$$.tmp |
| 153 | { | | 166 | { |
| 154 | - if test ${VCS+set} | | 167 | - if test ${VCS+set} |
| 155 | -then : | | 168 | -then : |
| 156 | - | | 169 | - |
| 157 | - : | | 170 | - : |
| 158 | - | | 171 | - |
| 159 | -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` | | 172 | -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` |
| 160 | -then : | | 173 | -then : |
| 161 | - | | 174 | - |
| 162 | - VCS='$(GIT)' | | 175 | - VCS='$(GIT)' |
| 163 | - | | 176 | - |