1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
$NetBSD: patch-configure,v 1.4 2022/12/05 11:47:03 jperkin Exp $
* Avoid bash specific variable substitution.
* Adding Interix support.
* Ignore doxygen.
* Ignore VCS.
* Handle SSP in pkgsrc.
* Retain _XOPEN_SOURCE, fixes eventmachine.
* Fix argument for pthread_self() on NetBSD.
* Explictly stop display with color.
--- configure.orig 2022-11-24 10:20:33.000000000 +0000
+++ configure
@@ -3942,12 +3942,12 @@ case "$target_cpu-$target_os" in #(
target_cpu=arm64
case "$target_vendor" in #(
unknown) :
- target_vendor=apple target=${target/-unknown-/-apple-} ;; #(
+ target_vendor=apple target=$(echo ${target} | sed -e 's/-unknown-/-apple-/g') ;; #(
*) :
;;
esac
- target="${target/aarch64/arm64}"
- target_alias="${target_alias/aarch64/arm64}"
+ target="$(echo ${target} | sed -e 's/aarch64/arm64/g')"
+ target_alias="$(echo ${target_alias} | sed -e 's/aarch64/arm64/g')"
;; #(
*) :
;;
@@ -9361,7 +9361,7 @@ else $as_nop
then :
case "$target_os" in #(
- darwin*) :
+ nodarwin*) :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
printf %s "checking for real target cpu... " >&6; }
@@ -11355,6 +11355,7 @@ fi
stack_protector=no
;; #(
*) :
+ stack_protector=no
;;
esac
if test -z "${stack_protector+set}"
@@ -13198,18 +13199,6 @@ then :
CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
esac
done
- # _XOPEN_SOURCE should not be defined for C++ on Solaris.
- # RUBY_APPEND_OPTIONS(CXXFLAGS)
- for rb_opt in -U_XOPEN_SOURCE; do
- case " ${CXXFLAGS-} " in #(
- *" ${rb_opt} "*) :
- ;; #(
- ' ') :
- CXXFLAGS="${rb_opt}" ;; #(
- *) :
- CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
-esac
- done
fi
@@ -13437,6 +13426,10 @@ esac
ac_cv_func___builtin_setjmp=no
;; #(
+ interix*) :
+ LIBS="-lm $LIBS"
+ ac_cv_func_getpgrp_void=yes
+ ;; #(
*) :
;;
esac
@@ -25518,7 +25511,9 @@ else
#include <stdlib.h>
#include <stddef.h>
#ifndef alloca
-# ifdef __GNUC__
+# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+# include <stdlib.h>
+# elif defined __GNUC__
# define alloca __builtin_alloca
# elif defined _MSC_VER
# include <malloc.h>
@@ -30542,6 +30537,8 @@ fi
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
+ RPATHFLAG=' -Wl,-R%1$-s'
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
@@ -30713,7 +30710,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5
printf %s "checking whether $flag is accepted for bundle... " >&6; }
: > conftest.c
- if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
+ if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
test ! -s conftest.err
then :
@@ -31748,8 +31745,10 @@ fi
;; #(
freebsd*|dragonfly*) :
+ RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
- LIBRUBY_SONAME='$(LIBRUBY_SO)'
+ LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
+ LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
if test "$rb_cv_binary_elf" != "yes"
then :
@@ -31847,9 +31846,10 @@ esac
;; #(
darwin*) :
+ RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
- LIBRUBY_SONAME='$(LIBRUBY_SO)'
- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
+ LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
+ LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
if test "$load_relative" = yes
then :
@@ -31872,7 +31872,12 @@ fi
;; #(
interix*) :
- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
+ SOLIBS='$(LIBS)'
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
+ # link explicitly to 0x48000000
+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
;; #(
cygwin*|msys*|mingw*|mswin*) :
@@ -32065,7 +32070,7 @@ then :
esac
rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" |
- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
`
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
@@ -33706,7 +33711,7 @@ guard=INCLUDE_RUBY_CONFIG_H
(
if test "x$CONFIGURE_TTY" = xyes
then :
- color=--color
+ color=--color=never
else $as_nop
color=
fi
@@ -34930,21 +34935,7 @@ which seems to be undefined. Please mak
"Makefile":F)
tmpmk=confmk$$.tmp
{
- if test ${VCS+set}
-then :
-
- :
-
-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`
-then :
-
- VCS='$(GIT)'
-
-else $as_nop
-
VCS='echo cannot'
-
-fi
case "$VCS" in #(
'$(GIT)'|git) :
VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)' ;; #(
|
