Skip to content

Merge from ruby master#32

Merged
kou merged 19 commits into
ruby:masterfrom
nobu:merge-from-ruby-master
Apr 29, 2020
Merged

Merge from ruby master#32
kou merged 19 commits into
ruby:masterfrom
nobu:merge-from-ruby-master

Conversation

@nobu

@nobu nobu commented Apr 29, 2020

Copy link
Copy Markdown
Member

No description provided.

hsbt added 2 commits April 29, 2020 21:39
This reverts commit ce6caade7c57a505f73086ccd7b33c14f7715f22.
This reverts commit 4d844cbaed518743776594fa5ae33b86fe176ad1.
@nobu nobu force-pushed the merge-from-ruby-master branch 2 times, most recently from ab9f410 to cc8140b Compare April 29, 2020 14:24
jeremyevans and others added 17 commits April 30, 2020 00:32
This removes the related tests, and puts the related specs behind
version guards.  This affects all code in lib, including some
libraries that may want to support older versions of Ruby.
… (#2686)

This issue happened when `libc.so` and `libm.so` path were not found
and `ldd ruby` command also failed to print the shared dependencies
in `test/fiddle/helper.rb`.

See https://travis-ci.org/ruby/ruby/jobs/611483288#L3018
/home/travis/build/ruby/ruby/build/.ext/common/fiddle/import.rb:299:in `import_function': cannot find the function: strcpy() (Fiddle::DLError)

* Set libc6:armhf as a installing dependency explicitly.
* Remove arm32 from allow_failures.
The same as ruby/ruby#2686, but for musl libc.
Musl is not named as libc.so.6 so the `ldd` hack implemented some lines
below does not work.
  Because the package provided by GitHub releases is different from sourceware.
On OpenBSD, USE_FFI_CLOSURE_ALLOC was always set to 0 previously. In
633a1f15d8228236094ddee12e4e169d655ec49e, the code was modified in a
way that it ended up being set to 1 on OpenBSD.  However, that results
in SIGABRT when running make test-all, inside ffi_closure_free.
Setting USE_FFI_CLOSURE_ALLOC back to 0 fixes the issue.
It is not needed to test itself, but the element should be tested
instead.
@nobu nobu force-pushed the merge-from-ruby-master branch from a929b3a to d932fc0 Compare April 29, 2020 15:32
@kou kou merged commit 03e7513 into ruby:master Apr 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants