Skip to content

Commit ec0a59d

Browse files
committed
libarchive: Disable libstone support, enable more features
Changes: - Disables libstone support until it doesn't break the test suite or opening zip files - Enables the test suite - Enables bzip2 support - Enables lzo2 support - Enables libb2 (blake2) support Signed-off-by: Reilly Brogan <[email protected]>
1 parent e83780c commit ec0a59d

File tree

3 files changed

+31
-8
lines changed

3 files changed

+31
-8
lines changed

l/libarchive/manifest.x86_64.bin

41 Bytes
Binary file not shown.

l/libarchive/manifest.x86_64.jsonc

+12-4
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,28 @@
44
"packages": {
55
"libarchive": {
66
"build-depends": [
7+
"pkgconfig(bzip2)",
8+
"pkgconfig(ext2fs)",
79
"pkgconfig(libacl)",
10+
"pkgconfig(libb2)",
811
"pkgconfig(libcrypto)",
912
"pkgconfig(liblz4)",
1013
"pkgconfig(liblzma)",
11-
"pkgconfig(libstone)",
1214
"pkgconfig(libxml-2.0)",
1315
"pkgconfig(libzstd)",
16+
"pkgconfig(lzo2)",
1417
"pkgconfig(zlib)"
1518
],
1619
"depends": [
1720
"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
1821
"soname(libacl.so.1(x86_64))",
22+
"soname(libb2.so.1(x86_64))",
23+
"soname(libbz2.so.1.0(x86_64))",
1924
"soname(libc.so.6(x86_64))",
2025
"soname(libcrypto.so.3(x86_64))",
2126
"soname(liblz4.so.1(x86_64))",
2227
"soname(liblzma.so.5(x86_64))",
23-
"soname(libstone.so.0.24(x86_64))",
28+
"soname(liblzo2.so.2(x86_64))",
2429
"soname(libxml2.so.2(x86_64))",
2530
"soname(libz.so.1(x86_64))",
2631
"soname(libzstd.so.1(x86_64))"
@@ -52,13 +57,16 @@
5257
},
5358
"libarchive-devel": {
5459
"build-depends": [
60+
"pkgconfig(bzip2)",
61+
"pkgconfig(ext2fs)",
5562
"pkgconfig(libacl)",
63+
"pkgconfig(libb2)",
5664
"pkgconfig(libcrypto)",
5765
"pkgconfig(liblz4)",
5866
"pkgconfig(liblzma)",
59-
"pkgconfig(libstone)",
6067
"pkgconfig(libxml-2.0)",
6168
"pkgconfig(libzstd)",
69+
"pkgconfig(lzo2)",
6270
"pkgconfig(zlib)"
6371
],
6472
"depends": [
@@ -115,6 +123,6 @@
115123
}
116124
},
117125
"source-name": "libarchive",
118-
"source-release": "8",
126+
"source-release": "9",
119127
"source-version": "3.7.7"
120128
}

l/libarchive/stone.yaml

+19-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
name : libarchive
77
version : 3.7.7
8-
release : 8
8+
release : 9
99
summary : Multi-format archive and compression library
1010
license : BSD-2-Clause
1111
homepage : https://www.libarchive.org
@@ -14,23 +14,38 @@ description : |
1414
upstreams :
1515
- https://www.libarchive.org/downloads/libarchive-3.7.4.tar.gz: 7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8
1616
builddeps :
17+
- pkgconfig(bzip2)
18+
- pkgconfig(ext2fs)
1719
- pkgconfig(libacl)
20+
- pkgconfig(libb2)
1821
- pkgconfig(libcrypto)
1922
- pkgconfig(liblz4)
2023
- pkgconfig(liblzma)
21-
- pkgconfig(libstone)
24+
# - pkgconfig(libstone)
2225
- pkgconfig(libxml-2.0)
2326
- pkgconfig(libzstd)
27+
- pkgconfig(lzo2)
2428
- pkgconfig(zlib)
29+
tuning :
30+
- lto: full
2531
setup : |
26-
%patch %(pkgdir)/stone-read-support.patch
32+
# libstone support disabled until it doesn't break zip files
33+
# %patch %(pkgdir)/stone-read-support.patch
34+
2735
%reconfigure --disable-rpath \
2836
--disable-static \
2937
--enable-bsdcpio=static \
3038
--enable-bsdtar=static \
3139
--enable-shared \
32-
--with-libstone
40+
--with-lzo2
3341
build : |
3442
%make
3543
install : |
3644
%make_install
45+
check : |
46+
# Note, the test suite MUST succeed at all times
47+
48+
# This skips a file descriptor test that fails in boulder. We may need to change how /tmp is mounted
49+
export SKIP_OPEN_FD_ERR_TEST=1
50+
51+
%make check || (cat /tmp/libarchive_test*/*.log && exit 1)

0 commit comments

Comments
 (0)