c28714cbc8
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
36 lines
1.4 KiB
Text
36 lines
1.4 KiB
Text
--- configure.ac.orig 2022-04-12 11:48:55 UTC
|
|
+++ configure.ac
|
|
@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS(utime.h)
|
|
AC_CHECK_HEADERS(time.h)
|
|
AC_CHECK_HEADERS(ucontext.h)
|
|
AC_CHECK_HEADERS(utime.h)
|
|
-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
|
|
+AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [
|
|
AC_CHECK_HEADERS(x86intrin.h)
|
|
])
|
|
|
|
@@ -2825,7 +2825,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
|
|
: ${LDSHARED='$(CC) -shared'}
|
|
AS_IF([test "$rb_cv_binary_elf" = yes], [
|
|
LDFLAGS="$LDFLAGS -rdynamic"
|
|
- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
|
|
+ DLDFLAGS="$DLDFLAGS "'-Wl,-E'
|
|
], [
|
|
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
|
|
])
|
|
@@ -3324,6 +3324,7 @@ AS_CASE("$enable_shared", [yes], [
|
|
[freebsd*|dragonfly*], [
|
|
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
|
|
LIBRUBY_SONAME='$(LIBRUBY_SO)'
|
|
+ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
|
|
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
|
|
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
|
|
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")
|
|
])
|
|
|