summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-04-17 08:15:50 -0500
committerZach van Rijn <me@zv.io>2022-11-02 15:54:34 -0500
commit31a7be1b9e7d2c2756cfdfd6a8470cd31e2ea8b0 (patch)
tree7d615ef33953f904aa182af4aa244928605c79b5
parentc87d1a775352f6c992b4f515ffa88c79a9cefa51 (diff)
downloadpackages-31a7be1b9e7d2c2756cfdfd6a8470cd31e2ea8b0.tar.gz
packages-31a7be1b9e7d2c2756cfdfd6a8470cd31e2ea8b0.tar.bz2
packages-31a7be1b9e7d2c2756cfdfd6a8470cd31e2ea8b0.tar.xz
packages-31a7be1b9e7d2c2756cfdfd6a8470cd31e2ea8b0.zip
experimental/libabigail: fix .apk handling
-rw-r--r--experimental/libabigail/APKBUILD2
-rw-r--r--experimental/libabigail/apk.patch14
2 files changed, 16 insertions, 0 deletions
diff --git a/experimental/libabigail/APKBUILD b/experimental/libabigail/APKBUILD
index 9791b236b..673d0cfb4 100644
--- a/experimental/libabigail/APKBUILD
+++ b/experimental/libabigail/APKBUILD
@@ -13,6 +13,7 @@ makedepends="$depends_dev autoconf automake elfutils-dev fts-dev libtool
libxml2-dev python3"
subpackages="$pkgname-dev"
source="http://mirrors.kernel.org/sourceware/libabigail/$pkgname-$pkgver.tar.gz
+ apk.patch
musl-basename.patch
musl-fts.patch
redhat-bs.patch"
@@ -44,6 +45,7 @@ package() {
}
sha512sums="02971c8f760cd7c6e7f77ef323c93769270666652a8f491b30cce74aa9bc20e2c5113eca0a534b814e9c8567538b6b7b84d15687e0ac15cf8ece736b2f7e2261 libabigail-1.7.tar.gz
+8d6ba251d81dd687a71da82c17d33f38bd0eee78daa7c0f9a6a2bb5751b247734d7b4648a101f862ffa7c244ad207007d9402c4f22df132890ca02cc5ce6b090 apk.patch
9d1a4eb781491400a06789a15f91c778e5c003d9db00713c4ccae1b23a46ed43dfb89c760026a052ceae4da93145bca2d15a76f3d5b726dc75535e55617cdbee musl-basename.patch
ef5c7db0ce05dff36c654e4a6345ded43032b76bdc9159da60a5fdc59b3c70943881cb19c87a4c6b30eccb774c6c7767e790b395564058f5dbaa6e3f3e0b1373 musl-fts.patch
0f5dcee3fbb1ee949df22e13a8ad248a8e39a086cb4c3561f5f45235c2f27cc589a07886560e2ecf7ee040811f64892c0e74ed653e0a1a5d20e62ab360c388a4 redhat-bs.patch"
diff --git a/experimental/libabigail/apk.patch b/experimental/libabigail/apk.patch
new file mode 100644
index 000000000..d763746ae
--- /dev/null
+++ b/experimental/libabigail/apk.patch
@@ -0,0 +1,14 @@
+Treat .apk as a .tar file instead of erroring out
+
+--- libabigail-1.7/src/abg-tools-utils.cc 2020-02-26 07:03:05.000000000 -0600
++++ libabigail-1.7/src/abg-tools-utils.cc 2020-04-17 08:10:18.899192507 -0500
+@@ -1529,7 +1529,8 @@ guess_file_type(const string& file_path)
+ || string_ends_with(file_path, ".tlz")
+ || string_ends_with(file_path, ".tar.Z")
+ || string_ends_with(file_path, ".taz")
+- || string_ends_with(file_path, ".tz"))
++ || string_ends_with(file_path, ".tz")
++ || string_ends_with(file_path, ".apk"))
+ return FILE_TYPE_TAR;
+
+ ifstream in(file_path.c_str(), ifstream::binary);