diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /lang/ruby40/files/patch-configure.ac | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'lang/ruby40/files/patch-configure.ac')
| -rw-r--r-- | lang/ruby40/files/patch-configure.ac | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/lang/ruby40/files/patch-configure.ac b/lang/ruby40/files/patch-configure.ac new file mode 100644 index 000000000000..2e3c608f9449 --- /dev/null +++ b/lang/ruby40/files/patch-configure.ac @@ -0,0 +1,36 @@ +--- configure.ac.orig 2024-12-12 01:10:13 UTC ++++ configure.ac +@@ -1411,7 +1411,7 @@ AC_CHECK_HEADERS(stdatomic.h) + AC_CHECK_HEADERS(stdckdint.h) + AC_CHECK_HEADERS(stdatomic.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) + ]) + RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h) +@@ -3149,7 +3149,7 @@ AC_SUBST(EXTOBJS) + : ${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' + ]) +@@ -3611,6 +3611,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='' +@@ -4443,6 +4444,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") + |