Merge branch 'master' of ssh://git.karchnu.fr:2202/WeirdOS/recipes

bzip2/recipe.spec

@@ -1,9 +1,9 @@
 name: bzip2
 version: 1.0.6
-release: 1
+release: 2
 sources: https://downloads.sourceforge.net/project/bzip2/bzip2-%{version}.tar.gz
 options:
-	- make install: PREFIX='%{pkg}/usr'
+	- make install: PREFIX='%{pkg}%{prefix}'
 
 @configure
 	sed -i.orig -e '/^CFLAGS=/s/.*/CFLAGS = -O2 -fPIC/' bzip2-%{version}/Makefile

libarchive/recipe.spec

@@ -1,4 +1,35 @@
 name: libarchive
 version: 3.3.3
-release: 1
+release: 2
 sources: https://www.libarchive.org/downloads/libarchive-%{version}.tar.gz
+build-dependencies: xz-dev, zlib-dev, bzip2-dev, lzo-dev
+dependencies: xz, zlib, bzip2, lzo
+
+options:
+	- configure: --with-zlib --with-lzo2 --with-lzma --with-bz2lib --without-zstd --without-cng --without-nettle --without-openssl --without-expat --without-xml2 --enable-posix-regex-lib=libc LDFLAGS="-L%{prefix}/lib -static"
+
+@build
+	cd %{name}-%{version}
+	make
+
+	for i in tar cpio cat; do
+		${CC:-cc} -static -o bsd${i} \
+			${i}/*.o \
+			.libs/libarchive.a .libs/libarchive_fe.a \
+			-llzma -lz -llzo2 -lbz2
+	done
+
+# FIXME: We’ll want to use those as default `tar`, `cpio` and `zcat`
+#        implementations in the future.
+%split bsdtar
+	files: %{prefix}/bin/bsdtar
+	dependencies: libarchive
+
+%split bsdcpio
+	files: %{prefix}/bin/bsdcpio
+	dependencies: libarchive
+
+%split bsdcat
+	files: %{prefix}/bin/bsdcat
+	dependencies: libarchive
+

lzo/recipe.spec

@@ -0,0 +1,3 @@
+name: lzo
+version: 2.10
+sources: http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz

package/recipe.spec

@@ -1,6 +1,6 @@
 name: package
 version: 0.7.0
-release: 1
+release: 2
 sources:
 	- https://git.karchnu.fr/WeirdOS/package/archive/%{version}.tar.gz -> %{name}-%{version}.tar.gz
 	- config.cfg
@@ -10,7 +10,7 @@ build-dependencies: crystal, spec-parser
 # FIXME: bsdtar should be split out so that we depend only on it.
 # Busybox is required mostly for `wget`.
 # abuild and zsh are required for assemble-apk.
-dependencies: gc, libevent, pcre, libarchive, busybox, zsh, abuild, gnutar
+dependencies: gc, libevent, pcre, bsdtar, busybox, zsh, abuild, gnutar
 
 dirname: package
 @configure

xz/recipe.spec

@@ -0,0 +1,3 @@
+name: xz
+version: 5.2.4
+sources: https://tukaani.org/xz/xz-%{version}.tar.xz