openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-18 07:24:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix RbConfig::CONFIG['STRIP']

Browse Source 
The ports infrastructure places a strip executable in the path while building
that always returns true.  This negatively affects Ruby's detection of valid
strip options.  Patch configure to not accept -A -n flags to strip, so Ruby
will pick up -S -x flags instead.

OK rsadowski@
"probably the simplest way to fix it" sthen@
This commit is contained in:
jeremy
2025-06-22 19:30:02 +00:00
parent 199abfe2a1
commit e2bc08c101
6 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/ruby/3.2/Makefile
+1 -1
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
lang/ruby/3.2/patches/patch-configure
+11
View File
@@ -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*) :
lang/ruby/3.3/Makefile
+1
View File
@@ -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
lang/ruby/3.3/patches/patch-configure
+11
View File
@@ -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*) :
lang/ruby/3.4/Makefile
+1
View File
@@ -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
lang/ruby/3.4/patches/patch-configure
+11
View File
@@ -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*) :