diff --git a/lang/ruby/3.2/Makefile b/lang/ruby/3.2/Makefile index 961fedf844d..245444841a3 100644 --- a/lang/ruby/3.2/Makefile +++ b/lang/ruby/3.2/Makefile @@ -3,7 +3,7 @@ DISTNAME = ruby-${VERSION} SHARED_LIBS = ruby32 0.0 NEXTVER = 3.3 PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER} -REVISION-main = 0 +REVISION-main = 1 PSEUDO_FLAVORS= no_ri_docs bootstrap # Do not build the RI docs on slow arches diff --git a/lang/ruby/3.2/patches/patch-configure b/lang/ruby/3.2/patches/patch-configure index 9d7b57ebbcf..dc48164efef 100644 --- a/lang/ruby/3.2/patches/patch-configure +++ b/lang/ruby/3.2/patches/patch-configure @@ -1,6 +1,8 @@ Support arm64 coroutines. Don't downgrade arm64 branch protection. +Don't use -A -n flags to strip (broken by default due to ports infrastructure). + Set correct shared library name. Override the arch setting to remove OpenBSD version from it, @@ -29,6 +31,15 @@ Index: configure *-openbsd*) : coroutine_type=pthread +@@ -31212,7 +31216,7 @@ main (void) + _ACEOF + if ac_fn_c_try_link "$LINENO" + then : +- if "${STRIP}" -A -n conftest$ac_exeext 2>/dev/null ++ if false # "${STRIP}" -A -n conftest$ac_exeext 2>/dev/null + then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: -A -n" >&5 @@ -31765,7 +31769,7 @@ fi ;; #( openbsd*|mirbsd*) : diff --git a/lang/ruby/3.3/Makefile b/lang/ruby/3.3/Makefile index 7af9284d523..032e2ffbeda 100644 --- a/lang/ruby/3.3/Makefile +++ b/lang/ruby/3.3/Makefile @@ -5,6 +5,7 @@ PKGNAME-ri_docs = ruby${BINREV}-ri_docs-${VERSION} SHARED_LIBS = ruby33 0.0 NEXTVER = 3.4 PKGSPEC-main ?= ruby->=3.3.0,<${NEXTVER} +REVISION-main = 0 PSEUDO_FLAVORS= no_ri_docs bootstrap # Do not build the RI docs on slow arches diff --git a/lang/ruby/3.3/patches/patch-configure b/lang/ruby/3.3/patches/patch-configure index f3e5c48565b..85288a7c1ca 100644 --- a/lang/ruby/3.3/patches/patch-configure +++ b/lang/ruby/3.3/patches/patch-configure @@ -1,5 +1,7 @@ Set correct shared library name. +Don't use -A -n flags to strip (broken by default due to ports infrastructure). + Override the arch setting to remove OpenBSD version from it, so ports don't have to be bumped when OpenBSD version changes. @@ -15,6 +17,15 @@ Index: configure do : +@@ -31464,7 +31464,7 @@ main (void) + _ACEOF + if ac_fn_c_try_link "$LINENO" + then : +- if "${STRIP}" -A -n conftest$ac_exeext 2>/dev/null ++ if false # "${STRIP}" -A -n conftest$ac_exeext 2>/dev/null + then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: -A -n" >&5 @@ -32012,7 +32012,7 @@ fi ;; #( openbsd*|mirbsd*) : diff --git a/lang/ruby/3.4/Makefile b/lang/ruby/3.4/Makefile index 279cfa0b541..59f914d9dbe 100644 --- a/lang/ruby/3.4/Makefile +++ b/lang/ruby/3.4/Makefile @@ -5,6 +5,7 @@ PKGNAME-ri_docs = ruby${BINREV}-ri_docs-${VERSION} SHARED_LIBS = ruby34 0.0 NEXTVER = 3.5 PKGSPEC-main ?= ruby->=3.4.0,<${NEXTVER} +REVISION-main = 0 PSEUDO_FLAVORS= no_ri_docs bootstrap # Do not build the RI docs on slow arches diff --git a/lang/ruby/3.4/patches/patch-configure b/lang/ruby/3.4/patches/patch-configure index 5ce2370a88e..f80d54fb333 100644 --- a/lang/ruby/3.4/patches/patch-configure +++ b/lang/ruby/3.4/patches/patch-configure @@ -1,5 +1,7 @@ Using -mbranch-protection=standard to build with BTI support on aarch64. +Don't use -A -n flags to strip (broken by default due to ports infrastructure). + Set correct shared library name. Override the arch setting to remove OpenBSD version from it, @@ -17,6 +19,15 @@ Index: configure do : # Try these flags in the _prepended_ position - i.e. we want to try building a program +@@ -31731,7 +31731,7 @@ main (void) + _ACEOF + if ac_fn_c_try_link "$LINENO" + then : +- if "${STRIP}" -A -n conftest$ac_exeext 2>/dev/null ++ if false # "${STRIP}" -A -n conftest$ac_exeext 2>/dev/null + then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: -A -n" >&5 @@ -32280,7 +32280,7 @@ fi ;; #( openbsd*|mirbsd*) :