The configure script attempts to enable PAC by checking for the

-mbranch-protection=pac-ret compiler option and using that in the build.
On OpenBSD this actually disables BTI support.  Change the configure
script to use -mbranch-protection=standard instead.

ok jeremy@
master
kettenis 2023-09-24 11:19:29 +00:00
parent 89580ed8c5
commit 7b48ffd628
2 changed files with 11 additions and 1 deletions

View File

@ -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

View File

@ -1,4 +1,5 @@
Support arm64 coroutines.
Don't downgrade arm64 branch protection.
Set correct shared library name.
@ -8,6 +9,15 @@ so ports don't have to be bumped when OpenBSD version changes.
Index: configure
--- configure.orig
+++ configure
@@ -10897,7 +10897,7 @@ esac
case "$target_cpu" in #(
aarch64) :
- for opt in -mbranch-protection=pac-ret -msign-return-address=all
+ for opt in -mbranch-protection=standard -msign-return-address=all
do :
@@ -29475,6 +29475,10 @@ esac
coroutine_type=x86