Skip to content

fix: compile aarch64-linux-android binary on linux when enable lto. #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
May 5, 2024
Merged

fix: compile aarch64-linux-android binary on linux when enable lto. #83

merged 3 commits into from
May 5, 2024

Conversation

fengys1996
Copy link

This PR changes pthread_atfork from a strong symbol to a weak symbol.

Related issue

#81

@fengys1996 fengys1996 marked this pull request as ready for review April 30, 2024 08:06
BusyJay
BusyJay reviewed Apr 30, 2024
View reviewed changes
jemalloc-sys/build.rs Outdated
@@ -338,6 +338,11 @@ fn main() {
println!("cargo:rustc-link-lib=atomic");
}
println!("cargo:rerun-if-changed=jemalloc");

cc::Build::new()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should only be built for android.

jemalloc-sys/src/pthread_atfork.c Outdated
// we're building on doesn't have them defined, so just make sure the symbols
// are available.
__attribute__((weak)) int
pthread_atfork(uint8_t *prefork __attribute__((unused)),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use the definition from https://man7.org/linux/man-pages/man3/pthread_atfork.3.html. The original definition is just for convenient.

@fengys1996
Copy link
Author

PTAL @BusyJay

@BusyJay
Copy link
Member

BusyJay commented Apr 30, 2024 •
edited
Loading

You need to sign off your commits.

@fengys1996
Copy link
Author

You need to sign off your commits.

Done.

BusyJay
BusyJay reviewed May 3, 2024
View reviewed changes
Copy link
Member

@BusyJay BusyJay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM

jemalloc-sys/src/pthread_atfork.c Outdated
@@ -0,0 +1,13 @@
#include <pthread.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need to include this header.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

fengys1996 added 3 commits May 5, 2024 10:57
@fengys1996
fix: compile aarch64-linux-android binary on linux when enable lto.
65a59e6 
Signed-off-by: fys <fengys1996@gmail.com>
@fengys1996
fix: cr
8603287 
1. Compile pthread_atfork.c when target contains "android".
2. Use original definition of "pthread_atfork".

Signed-off-by: fys <fengys1996@gmail.com>
@fengys1996
remove unnecessary header
bbd97f3 
Signed-off-by: fys <fengys1996@gmail.com>
@BusyJay BusyJay merged commit 805804a into tikv:main May 5, 2024
8 of 9 checks passed
@BusyJay
Copy link
Member

BusyJay commented May 5, 2024

Thank you!

@mukilan mukilan mentioned this pull request Jul 8, 2024
Closed
@fengys1996 fengys1996 deleted the fix/build_error branch August 20, 2024 06:56
@fengys1996 fengys1996 mentioned this pull request Aug 20, 2024
Merged
3 tasks
robertkirkman added a commit to robertkirkman/termux-packages that referenced this pull request May 14, 2025
@robertkirkman
addpkg(main/python-ruff): 0.11.9
f39642d 
- Fixes termux#24682
  - (fixes the command `pip install changedetection.io` on-device because `python-ruff` is a dependency of that and cannot currently be built on-device)

- Fixes dgtlmoon/changedetection.io#3188
 - (other workaround found there was to [edit the `requirements.txt` and remove `ruff`](https://github.com/dgtlmoon/changedetection.io/blob/c162ec9d52d9977cdd2a434351d7ab149bb6427e/requirements.txt#L116), now it should also work without needing to do that)

- Arch Linux `ruff`, `python-ruff` packages used to help: https://gitlab.archlinux.org/archlinux/packaging/packages/ruff/-/blob/d3288eff68a26c8f1d6268a6a42128f39e264410/PKGBUILD

- `--skip-auditwheel` workaround for `maturin`-related build errors when targeting Termux found here: PyO3/pyo3#2324

- `tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff` is no longer applying + no longer necessary after tikv/jemallocator#83
@robertkirkman robertkirkman mentioned this pull request May 14, 2025
Merged
robertkirkman added a commit to robertkirkman/termux-packages that referenced this pull request May 14, 2025
@robertkirkman
addpkg(main/python-ruff): 0.11.9
7e9c50c 
- Fixes termux#24682
  - (fixes the command `pip install changedetection.io` on-device because `python-ruff` is a dependency of that and cannot currently be built on-device)

- Fixes dgtlmoon/changedetection.io#3188
  - (other workaround found there was to [edit the `requirements.txt` and remove `ruff`](https://github.com/dgtlmoon/changedetection.io/blob/c162ec9d52d9977cdd2a434351d7ab149bb6427e/requirements.txt#L116), now it should also work without needing to do that)

- Arch Linux `ruff`, `python-ruff` packages used to help: https://gitlab.archlinux.org/archlinux/packaging/packages/ruff/-/blob/d3288eff68a26c8f1d6268a6a42128f39e264410/PKGBUILD

- `--skip-auditwheel` workaround for `maturin`-related build errors when targeting Termux found here: PyO3/pyo3#2324

- `tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff` is no longer applying + no longer necessary after tikv/jemallocator#83
robertkirkman added a commit to robertkirkman/termux-packages that referenced this pull request May 15, 2025
@robertkirkman
addpkg(main/python-ruff): 0.11.9
e419b2c 
- Fixes termux#24682
  - (fixes the command `pip install changedetection.io` on-device because `python-ruff` is a dependency of that and cannot currently be built on-device)

- Fixes dgtlmoon/changedetection.io#3188
  - (other workaround found there was to [edit the `requirements.txt` and remove `ruff`](https://github.com/dgtlmoon/changedetection.io/blob/c162ec9d52d9977cdd2a434351d7ab149bb6427e/requirements.txt#L116), now it should also work without needing to do that)

- Arch Linux `ruff`, `python-ruff` packages used to help: https://gitlab.archlinux.org/archlinux/packaging/packages/ruff/-/blob/d3288eff68a26c8f1d6268a6a42128f39e264410/PKGBUILD

- `--skip-auditwheel` workaround for `maturin`-related build errors when targeting Termux found here: PyO3/pyo3#2324

- `tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff` is no longer applying + no longer necessary after tikv/jemallocator#83
robertkirkman added a commit to robertkirkman/termux-packages that referenced this pull request May 15, 2025
@robertkirkman
addpkg(main/python-ruff): 0.11.10
1f01cb2 
- Fixes termux#24682
  - (fixes the command `pip install changedetection.io` on-device because `python-ruff` is a dependency of that and cannot currently be built on-device)

- Fixes dgtlmoon/changedetection.io#3188
  - (other workaround found there was to [edit the `requirements.txt` and remove `ruff`](https://github.com/dgtlmoon/changedetection.io/blob/c162ec9d52d9977cdd2a434351d7ab149bb6427e/requirements.txt#L116), now it should also work without needing to do that)

- Arch Linux `ruff`, `python-ruff` packages used to help: https://gitlab.archlinux.org/archlinux/packaging/packages/ruff/-/blob/d3288eff68a26c8f1d6268a6a42128f39e264410/PKGBUILD

- `--skip-auditwheel` workaround for `maturin`-related build errors when targeting Termux found here: PyO3/pyo3#2324

- `tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff` is no longer applying + no longer necessary after tikv/jemallocator#83
robertkirkman added a commit to termux/termux-packages that referenced this pull request May 16, 2025
@robertkirkman
addpkg(main/python-ruff): 0.11.10
c2ba347 
- Fixes #24682
  - (fixes the command `pip install changedetection.io` on-device because `python-ruff` is a dependency of that and cannot currently be built on-device)

- Fixes dgtlmoon/changedetection.io#3188
  - (other workaround found there was to [edit the `requirements.txt` and remove `ruff`](https://github.com/dgtlmoon/changedetection.io/blob/c162ec9d52d9977cdd2a434351d7ab149bb6427e/requirements.txt#L116), now it should also work without needing to do that)

- Arch Linux `ruff`, `python-ruff` packages used to help: https://gitlab.archlinux.org/archlinux/packaging/packages/ruff/-/blob/d3288eff68a26c8f1d6268a6a42128f39e264410/PKGBUILD

- `--skip-auditwheel` workaround for `maturin`-related build errors when targeting Termux found here: PyO3/pyo3#2324

- `tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff` is no longer applying + no longer necessary after tikv/jemallocator#83
termux-pacman-bot added a commit to termux-pacman/termux-packages that referenced this pull request May 16, 2025
@termux-pacman-bot
addpkg(main/python-ruff): 0.11.10
1f23588 
- Fixes termux/termux-packages#24682
  - (fixes the command `pip install changedetection.io` on-device because `python-ruff` is a dependency of that and cannot currently be built on-device)

- Fixes dgtlmoon/changedetection.io#3188
  - (other workaround found there was to [edit the `requirements.txt` and remove `ruff`](https://github.com/dgtlmoon/changedetection.io/blob/c162ec9d52d9977cdd2a434351d7ab149bb6427e/requirements.txt#L116), now it should also work without needing to do that)

- Arch Linux `ruff`, `python-ruff` packages used to help: https://gitlab.archlinux.org/archlinux/packaging/packages/ruff/-/blob/d3288eff68a26c8f1d6268a6a42128f39e264410/PKGBUILD

- `--skip-auditwheel` workaround for `maturin`-related build errors when targeting Termux found here: PyO3/pyo3#2324

- `tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff` is no longer applying + no longer necessary after tikv/jemallocator#83
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BusyJay BusyJay BusyJay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fengys1996 @BusyJay