Skip to content
Snippets Groups Projects
Commit c28714cb authored by baptiste daroussin's avatar baptiste daroussin
Browse files

lang/ruby*: add a patch to keep amd64-freebsd* as arch

In preparation for the update of config.guess/config.sub, where
amd64-portbld-freebsd14.0 is reported as x86_64-portbld-freebsd14.0,
Add a patch to keep the arch specific directory on amd64 being named amd64
parent 8fed94d3
Branches
Tags
No related merge requests found
--- configure.ac.orig 2018-12-28 12:03:09 UTC --- configure.ac.orig 2022-04-12 11:25:48 UTC
+++ configure.ac +++ configure.ac
@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ @@ -2714,7 +2714,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED='$(CC) -shared'}
AS_IF([test "$rb_cv_binary_elf" = yes], [ AS_IF([test "$rb_cv_binary_elf" = yes], [
LDFLAGS="$LDFLAGS -rdynamic" LDFLAGS="$LDFLAGS -rdynamic"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
], [ ], [
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
]) ])
@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [ @@ -3200,6 +3200,7 @@ AS_CASE("$enable_shared", [yes], [
[freebsd*|dragonfly*], [ [freebsd*|dragonfly*], [
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
LIBRUBY_SONAME='$(LIBRUBY_SO)' LIBRUBY_SONAME='$(LIBRUBY_SO)'
...@@ -17,3 +17,11 @@ ...@@ -17,3 +17,11 @@
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''
@@ -3833,6 +3834,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
], [
arch="${target_cpu}-${target_os}"
+ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
])
--- configure.ac.orig 2022-04-12 11:48:55 UTC --- configure.ac.orig 2022-04-12 11:48:55 UTC
+++ configure.ac 2022-04-23 +++ configure.ac
@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h) @@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h)
AC_CHECK_HEADERS(time.h) AC_CHECK_HEADERS(time.h)
AC_CHECK_HEADERS(ucontext.h) AC_CHECK_HEADERS(ucontext.h)
...@@ -26,3 +26,11 @@ ...@@ -26,3 +26,11 @@
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''
@@ -3960,6 +3961,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
], [
arch="${target_cpu}-${target_os}"
+ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
])
...@@ -26,3 +26,11 @@ ...@@ -26,3 +26,11 @@
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''
@@ -4103,6 +4104,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
arch="${target_cpu}-mingw-ucrt"
], [
arch="${target_cpu}-${target_os}"
+ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
])
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
])
...@@ -26,3 +26,11 @@ ...@@ -26,3 +26,11 @@
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''
@@ -4150,6 +4151,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
arch="${target_cpu}-mingw-ucrt"
], [
arch="${target_cpu}-${target_os}"
+ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
])
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment