Skip to content

Fix TypeError when building for WebAssembly with Python 3#18633

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
laelath:master
Oct 23, 2020
Merged

Fix TypeError when building for WebAssembly with Python 3#18633
opencv-pushbot merged 1 commit intoopencv:3.4from
laelath:master

Conversation

@laelath
Copy link
Copy Markdown
Contributor

@laelath laelath commented Oct 21, 2020 •
edited by alalek
Loading

resolves #18632

Fixes TypeError mentioned in #18632.

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake (N/A)
force_builders=Custom,docs
build_image:Docs=docs-js
buildworker:Custom=linux-4
build_image:Custom=javascript-simd:1.39.16
Xbuild_image:Custom=javascript-simd

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 22, 2020

Thank you!

As a "bugfix" this patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@laelath laelath changed the base branch from master to 3.4 October 22, 2020 19:33
@opencv-pushbot opencv-pushbot merged commit 71462d9 into opencv:3.4 Oct 23, 2020
@alalek alalek mentioned this pull request Oct 26, 2020
Merged
@alalek alalek mentioned this pull request Nov 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install category: javascript (js)

Projects

None yet

Milestone

3.4.13

Development

Successfully merging this pull request may close these issues.

Undefined symbol when compiling with latest emscripten: __tls_base

3 participants

@laelath @alalek @opencv-pushbot