Skip to content

Commit 94a58cb

Browse files
oetikeroetiker
authored
Merge pull request #1560 from hadfl/ruby
ruby should not undefine _XOPEN_SOURCE in c++ context
2 parents 684a7e1 + 8cc7062 commit 94a58cb

18 files changed

+69
-13
lines changed

‎build/ruby/build-30.sh

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ init
5858
download_source $PROG $PROG $VER
5959
patch_source
6060
prep_build
61+
run_autoconf -f
6162
build
6263
make_package
6364
clean_up

‎build/ruby/build-31.sh

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ init
5858
download_source $PROG $PROG $VER
5959
patch_source
6060
prep_build
61+
run_autoconf -f
6162
build
6263
make_package
6364
clean_up

‎build/ruby/build-32.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
. ../../lib/build.sh
1818

1919
PROG=ruby
20-
VER=3.2.5
20+
VER=3.2.6
2121
PKG=ooce/runtime/ruby-32
2222
SUMMARY="Ruby"
2323
DESC="A dynamic, open source programming language "
@@ -61,6 +61,7 @@ init
6161
download_source $PROG $PROG $VER
6262
patch_source
6363
prep_build
64+
run_autoconf -f
6465
build
6566
make_package
6667
clean_up

‎build/ruby/build-33.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
. ../../lib/build.sh
1818

1919
PROG=ruby
20-
VER=3.3.5
20+
VER=3.3.6
2121
PKG=ooce/runtime/ruby-33
2222
SUMMARY="Ruby"
2323
DESC="A dynamic, open source programming language "
@@ -61,6 +61,7 @@ init
6161
download_source $PROG $PROG $VER
6262
patch_source
6363
prep_build
64+
run_autoconf -f
6465
build
6566
make_package
6667
clean_up

‎build/ruby/patches-30/02-config.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Changes were developed in-house, are Solaris specific,
44
# and are not suitable for upstream.
55

6-
diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess
6+
diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess
77
--- a~/tool/config.guess 1970-01-01 00:00:00
88
+++ a/tool/config.guess 1970-01-01 00:00:00
99
@@ -409,19 +409,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
@@ -29,10 +29,10 @@ diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess
2929
echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
3030
exit ;;
3131
sun4*:SunOS:6*:*)
32-
diff -wpruN '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub
32+
diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub
3333
--- a~/tool/config.sub 1970-01-01 00:00:00
3434
+++ a/tool/config.sub 1970-01-01 00:00:00
35-
@@ -1011,7 +1011,7 @@ case $cpu-$vendor in
35+
@@ -1028,7 +1028,7 @@ case $cpu-$vendor in
3636

3737
# Here we normalize CPU types irrespective of the vendor
3838
amd64-*)

‎build/ruby/patches-30/no-_XOPEN_SOURCE-undefine.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
2+
--- a~/configure.ac 1970-01-01 00:00:00
3+
+++ a/configure.ac 1970-01-01 00:00:00
4+
@@ -1064,8 +1064,6 @@ main()
5+
AC_MSG_RESULT($define_xopen_source)
6+
AS_IF([test x"$define_xopen_source" != xno], [
7+
RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
8+
- # _XOPEN_SOURCE should not be defined for C++ on Solaris.
9+
- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE)
10+
])
11+
])
12+
],

‎build/ruby/patches-30/openssl-EAGAIN.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
diff -wpruN '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c
22
--- a~/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00
33
+++ a/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00
44
@@ -1893,6 +1893,7 @@ ossl_ssl_read_internal(int argc, VALUE *

‎build/ruby/patches-30/openssl3.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
diff -wpruN '--exclude=*.orig' a~/ext/openssl/extconf.rb a/ext/openssl/extconf.rb
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/extconf.rb a/ext/openssl/extconf.rb
22
--- a~/ext/openssl/extconf.rb 1970-01-01 00:00:00
33
+++ a/ext/openssl/extconf.rb 1970-01-01 00:00:00
44
@@ -105,12 +105,11 @@ version_ok = if have_macro("LIBRESSL_VER
@@ -17,7 +17,7 @@ diff -wpruN '--exclude=*.orig' a~/ext/openssl/extconf.rb a/ext/openssl/extconf.r
1717
end
1818

1919
# Prevent wincrypt.h from being included, which defines conflicting macro with openssl/x509.h
20-
diff -wpruN '--exclude=*.orig' a~/ext/openssl/ossl_pkey_rsa.c a/ext/openssl/ossl_pkey_rsa.c
20+
diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/ossl_pkey_rsa.c a/ext/openssl/ossl_pkey_rsa.c
2121
--- a~/ext/openssl/ossl_pkey_rsa.c 1970-01-01 00:00:00
2222
+++ a/ext/openssl/ossl_pkey_rsa.c 1970-01-01 00:00:00
2323
@@ -947,7 +947,9 @@ Init_ossl_rsa(void)

‎build/ruby/patches-30/series

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
02-config.patch
22
openssl-EAGAIN.patch
33
openssl3.patch
4+
no-_XOPEN_SOURCE-undefine.patch

‎build/ruby/patches-31/02-config.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Changes were developed in-house, are Solaris specific,
44
# and are not suitable for upstream.
55

6-
diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess
6+
diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess
77
--- a~/tool/config.guess 1970-01-01 00:00:00
88
+++ a/tool/config.guess 1970-01-01 00:00:00
99
@@ -409,19 +409,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
@@ -29,7 +29,7 @@ diff -wpruN '--exclude=*.orig' a~/tool/config.guess a/tool/config.guess
2929
echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
3030
exit ;;
3131
sun4*:SunOS:6*:*)
32-
diff -wpruN '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub
32+
diff -wpruN --no-dereference '--exclude=*.orig' a~/tool/config.sub a/tool/config.sub
3333
--- a~/tool/config.sub 1970-01-01 00:00:00
3434
+++ a/tool/config.sub 1970-01-01 00:00:00
3535
@@ -1028,7 +1028,7 @@ case $cpu-$vendor in

‎build/ruby/patches-31/no-_XOPEN_SOURCE-undefine.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
2+
--- a~/configure.ac 1970-01-01 00:00:00
3+
+++ a/configure.ac 1970-01-01 00:00:00
4+
@@ -1151,8 +1151,6 @@ main()
5+
AC_MSG_RESULT($define_xopen_source)
6+
AS_IF([test x"$define_xopen_source" != xno], [
7+
RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
8+
- # _XOPEN_SOURCE should not be defined for C++ on Solaris.
9+
- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE)
10+
])
11+
])
12+
AC_CHECK_TYPES([caddr_t],[],[],[@%:@include <sys/types.h>])

‎build/ruby/patches-31/openssl-EAGAIN.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
diff -wpruN '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/ext/openssl/ossl_ssl.c a/ext/openssl/ossl_ssl.c
22
--- a~/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00
33
+++ a/ext/openssl/ossl_ssl.c 1970-01-01 00:00:00
44
@@ -1850,6 +1850,7 @@ ossl_ssl_read_internal(int argc, VALUE *

‎build/ruby/patches-31/series

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
02-config.patch
22
openssl-EAGAIN.patch
3+
no-_XOPEN_SOURCE-undefine.patch

‎build/ruby/patches-32/no-_XOPEN_SOURCE-undefine.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
2+
--- a~/configure.ac 1970-01-01 00:00:00
3+
+++ a/configure.ac 1970-01-01 00:00:00
4+
@@ -1144,8 +1144,6 @@ main()
5+
AC_MSG_RESULT($define_xopen_source)
6+
AS_IF([test x"$define_xopen_source" != xno], [
7+
RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
8+
- # _XOPEN_SOURCE should not be defined for C++ on Solaris.
9+
- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE)
10+
])
11+
])
12+
AC_CHECK_TYPES([caddr_t],[],[],[@%:@include <sys/types.h>])

‎build/ruby/patches-32/series

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
02-config.patch
22
openssl-EAGAIN.patch
3+
no-_XOPEN_SOURCE-undefine.patch

‎build/ruby/patches-33/no-_XOPEN_SOURCE-undefine.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
2+
--- a~/configure.ac 1970-01-01 00:00:00
3+
+++ a/configure.ac 1970-01-01 00:00:00
4+
@@ -1152,8 +1152,6 @@ main()
5+
AC_MSG_RESULT($define_xopen_source)
6+
AS_IF([test x"$define_xopen_source" != xno], [
7+
RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
8+
- # _XOPEN_SOURCE should not be defined for C++ on Solaris.
9+
- RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE)
10+
])
11+
])
12+
AC_CHECK_TYPES([caddr_t],[],[],[@%:@include <sys/types.h>])

‎build/ruby/patches-33/series

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
02-config.patch
22
openssl-EAGAIN.patch
3+
no-_XOPEN_SOURCE-undefine.patch

‎doc/packages.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
| ooce/runtime/node-22 | 22.12.0 | https://nodejs.org/download/release/index.json https://nodejs.org/en/download/ | [omniosorg](https://github.com/omniosorg)
195195
| ooce/runtime/ruby-30 | 3.0.7 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)
196196
| ooce/runtime/ruby-31 | 3.1.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)
197-
| ooce/runtime/ruby-32 | 3.2.5 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)
198-
| ooce/runtime/ruby-33 | 3.3.5 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)
197+
| ooce/runtime/ruby-32 | 3.2.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)
198+
| ooce/runtime/ruby-33 | 3.3.6 | https://www.ruby-lang.org/en/downloads/ | [omniosorg](https://github.com/omniosorg)
199199
| ooce/runtime/tcl | 8.6.14 | https://sourceforge.net/projects/tcl/files/Tcl/ https://www.tcl.tk/software/tcltk/download.html | [omniosorg](https://github.com/omniosorg)
200200
| ooce/security/gnupg | 2.4.5 | https://gnupg.org/download/ | [omniosorg](https://github.com/omniosorg)
201201
| ooce/security/minisign | 0.11 | https://github.com/jedisct1/minisign/releases | [omniosorg](https://github.com/omniosorg)

0 commit comments

Comments
 (0)