1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug #20783] Insert a space between RPATHFLAG and LIBPATHFLAG

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-10-04 18:49:47 +09:00
parent 86e8a36e77
commit 79a8750ade
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2024-10-04 10:39:47 +00:00 
Merged: https://github.com/ruby/ruby/pull/11797
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -3719,16 +3719,16 @@ AS_CASE("$enable_shared", [yes], [
]) ])
]) ])
AS_IF([test "$enable_rpath" = yes], [ AS_IF([test "$enable_rpath" = yes], [
test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS " AS_CASE(["${cross_compiling}${load_relative}"],
rpathflag="${RPATHFLAG}" [*yes*], [rpathflag="${RPATHFLAG}"],
AS_CASE(["${cross_compiling}${load_relative}"], [*yes*], [], [rpathflag="$RPATHFLAG$LIBPATHFLAG"]) [rpathflag="$RPATHFLAG${LIBPATHFLAG:+${RPATHFLAG:+ }$LIBPATHFLAG}"])
rpathflag=`IFS="$PATH_SEPARATOR" rpathflag=`IFS="$PATH_SEPARATOR"
echo x "$rpathflag" | 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}${libprefix}${IFS}g"
` `
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBY_RPATHFLAGS="${LIBRUBY_RPATHFLAGS:+$LIBRUBY_RPATHFLAGS }${rpathflag}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" LIBRUBYARG_SHARED="${LIBRUBY_RPATHFLAGS:+$LIBRUBY_RPATHFLAGS }$LIBRUBYARG_SHARED"
LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" LIBRUBYARG_STATIC="${LIBRUBY_RPATHFLAGS:+$LIBRUBY_RPATHFLAGS }$LIBRUBYARG_STATIC"
]) ])
AC_SUBST(LIBRUBY_RELATIVE) AC_SUBST(LIBRUBY_RELATIVE)