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

Revert soname changes

Browse Source 
- only i386-ucrt soname is changed to fix building on x86 clang
- fix detection of x86intrin.h on x86 system
- mingw does not have LIBRUBY_SONAME
This commit is contained in:
Raed Rizqie 2024-08-11 21:08:33 +08:00 committed by Nobuyoshi Nakada
parent 21dfe34aae
commit 703305bd03
Notes: git 2024-08-16 08:43:19 +00:00 
Merged: https://github.com/ruby/ruby/pull/11362
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1388,7 +1388,7 @@ AC_CHECK_HEADERS(sys/event.h)
AC_CHECK_HEADERS(stdckdint.h) AC_CHECK_HEADERS(stdckdint.h)
AC_CHECK_HEADERS(stdatomic.h) AC_CHECK_HEADERS(stdatomic.h)
AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [ AS_CASE("$target_cpu", [x64|x86_64|[i[3-6]86*]], [
AC_CHECK_HEADERS(x86intrin.h) AC_CHECK_HEADERS(x86intrin.h)
]) ])
RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h) RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
@ -3526,7 +3526,10 @@ AC_ARG_WITH(soname,
RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
], ],
[mingw*], [ [mingw*], [
RUBY_SO_NAME="${target_cpu}-${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
AS_IF([test x"${target_cpu}" != xi386 || test x"${rb_cv_msvcrt}" != xmsvcrt], [
RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
])
], ],
[RUBY_SO_NAME='$(RUBY_BASE_NAME)']) [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
]) ])
@ -4098,6 +4101,7 @@ enum {
[mingw*], [ [mingw*], [
AS_IF([test x"$enable_shared" = xyes], [ AS_IF([test x"$enable_shared" = xyes], [
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
LIBRUBY_SONAME=''
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
]) ])
EXPORT_PREFIX=' ' EXPORT_PREFIX=' '