Browse Source

elfutils: fix Android (#7989)

apocelipes 3 months ago
parent
commit
7eb0bfb644

+ 12 - 0
packages/e/elfutils/patches/0.183/libelf-map.patch

@@ -0,0 +1,12 @@
+diff --git a/libelf/libelf.map b/libelf/libelf.map
+index 10dc5059..25760bc4 100644
+--- a/libelf/libelf.map
++++ b/libelf/libelf.map
+@@ -50,7 +50,6 @@ ELFUTILS_1.0 {
+     elf_rand;
+     elf_rawdata;
+     elf_rawfile;
+-    elf_scncnt;
+     elf_strptr;
+     elf_update;
+     elf_version;

+ 12 - 0
packages/e/elfutils/patches/0.189/libelf-map.patch

@@ -0,0 +1,12 @@
+diff --git a/libelf/libelf.map b/libelf/libelf.map
+index 10dc5059..25760bc4 100644
+--- a/libelf/libelf.map
++++ b/libelf/libelf.map
+@@ -50,7 +50,6 @@ ELFUTILS_1.0 {
+     elf_rand;
+     elf_rawdata;
+     elf_rawfile;
+-    elf_scncnt;
+     elf_strptr;
+     elf_update;
+     elf_version;

+ 2 - 2
packages/e/elfutils/xmake.lua

@@ -12,7 +12,9 @@ package("elfutils")
     add_versions("0.190", "8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692")
 
     add_patches("0.183", path.join(os.scriptdir(), "patches", "0.183", "configure.patch"), "7a16719d9e3d8300b5322b791ba5dd02986f2663e419c6798077dd023ca6173a")
+    add_patches("0.183", path.join(os.scriptdir(), "patches", "0.183", "libelf-map.patch"), "27fc4a072c28b763896d5c63c23f81805cd5e25652b4836b6d139d7739c5e62f")
     add_patches("0.189", path.join(os.scriptdir(), "patches", "0.189", "configure.patch"), "b4016a97e6aaad92b15fad9a594961b1fc77a6d054ebadedef9bb3a55e99a8f8")
+    add_patches("0.189", path.join(os.scriptdir(), "patches", "0.189", "libelf-map.patch"), "27fc4a072c28b763896d5c63c23f81805cd5e25652b4836b6d139d7739c5e62f")
     add_patches("0.190", path.join(os.scriptdir(), "patches", "0.190", "configure.patch"), "8118132b8499ba54b0dbed823295d17f79670060c2cee9f3a186ce966bed9a75")
 
     add_configs("libelf",   {description = "Enable libelf", default = true, type = "boolean"})
@@ -42,8 +44,6 @@ package("elfutils")
         on_check("android", function (package)
             local ndk = package:toolchain("ndk")
             local ndk_sdkver = ndk:config("ndk_sdkver")
-            local ndkver = ndk:config("ndkver")
-            assert(ndkver and tonumber(ndkver) < 26, "package(elfutils): need ndk version < 26 for android")
             assert(ndk_sdkver and tonumber(ndk_sdkver) <= 23, "package(elfutils): need ndk api level <= 23 for android")
         end)
     end