diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2023-10-13 08:47:03 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2023-10-20 10:35:00 +0300 |
| commit | 7f6d52d26c9b1ea14e3e5c97118cd317dfc4b4fe (patch) | |
| tree | 117cbd7d3c0e6f998bac79db2595ca9be66bec73 /recipes | |
| parent | 64809d6d6987126e516b5b61e43ee2c01fe8aac6 (diff) | |
cargo-c: Drop patch for Android NDK linking
This was only required in pre-25 NDK and when using ld.gold. It is not
required for the clang linker anymore, which is the only one we support
now.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1282>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/build-tools/cargo-c.recipe | 5 | ||||
| -rw-r--r-- | recipes/build-tools/cargo-c/0001-Fix-linking-with-Android-NDK-linker.patch | 27 |
2 files changed, 0 insertions, 32 deletions
diff --git a/recipes/build-tools/cargo-c.recipe b/recipes/build-tools/cargo-c.recipe index 8dc77531..389fb3f0 100644 --- a/recipes/build-tools/cargo-c.recipe +++ b/recipes/build-tools/cargo-c.recipe @@ -13,11 +13,6 @@ class Recipe(recipe.Recipe): # Need system openssl on Linux use_system_libs = True - patches = [ - # https://github.com/lu-zero/cargo-c/pull/277 - name + '/0001-Fix-linking-with-Android-NDK-linker.patch', - ] - deps = ['zlib', 'pkg-config'] # Need openssl on macOS. On Windows, a prebuilt openssl crate is downloaded. platform_deps = { diff --git a/recipes/build-tools/cargo-c/0001-Fix-linking-with-Android-NDK-linker.patch b/recipes/build-tools/cargo-c/0001-Fix-linking-with-Android-NDK-linker.patch deleted file mode 100644 index 0e7a65b3..00000000 --- a/recipes/build-tools/cargo-c/0001-Fix-linking-with-Android-NDK-linker.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 305ea8afe4ba7b7c610ccb49e8d299b25d40ea75 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan <nirbheek@centricular.com> -Date: Thu, 1 Sep 2022 21:33:29 +0530 -Subject: [PATCH] Fix linking with Android NDK linker - -Android ld.gold cannot handle -Wl, and it's incorrect anyway since all -the other linker arguments passed by cargo do not have a -Wl prefix. ---- - src/target.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/target.rs b/src/target.rs -index 136cf54..8c560d1 100644 ---- a/src/target.rs -+++ b/src/target.rs -@@ -73,7 +73,7 @@ impl Target { - let sover = version.main_version(); - - if os == "android" { -- lines.push(format!("-Wl,-soname,lib{lib_name}.so")); -+ lines.push(format!("-soname,lib{lib_name}.so")); - } else if os == "linux" - || os == "freebsd" - || os == "dragonfly" --- -2.41.0 - |