moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps: rebuild against libarchive-3.1.2.

Browse source
This commit is contained in:
Juan RP 2013-02-20 14:58:13 +01:00
parent e05f0690f3
commit 8e91aef04e
2 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

43
srcpkgs/xbps/patches/0011-Add-libarchive-compat-definitions-for-3.1.2.patch Normal file
View file

@ -0,0 +1,43 @@
From 5471c7f46c5717264cfb7f761c29a2cf84bf68cc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 20 Feb 2013 14:52:01 +0100
Subject: [PATCH] Add libarchive compat definitions for 3.1.2.
---
include/xbps_api_impl.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
index c5782f4..08987d1 100644
--- include/xbps_api_impl.h
+++ include/xbps_api_impl.h
@@ -55,6 +55,26 @@
#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
#endif
+/* libarchive compat */
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+
+#define archive_read_support_compression_gzip(x) \
+ archive_read_support_filter_gzip(x)
+
+#define archive_read_support_compression_bzip2(x) \
+ archive_read_support_filter_bzip2(x)
+
+#define archive_read_support_compression_xz(x) \
+ archive_read_support_filter_xz(x)
+
+#define archive_read_finish(x) \
+ archive_read_free(x)
+
+#define archive_compression_name(x) \
+ archive_filter_name(x, 0)
+
+#endif
+
__BEGIN_DECLS
/**
--
1.8.1.1

8
srcpkgs/xbps/template
View file

@ -1,13 +1,13 @@
# Template file for 'xbps' # Template file for 'xbps'
pkgname=xbps pkgname=xbps
version=0.20 version=0.20
revision=9 revision=10
build_style=configure build_style=configure
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
--enable-static --enable-debug" --enable-static --enable-debug"
depends="xbps-triggers" depends="xbps-triggers"
makedepends="which pkg-config proplib-devel>=0.6.2 openssl-devel makedepends="which pkg-config proplib-devel>=0.6.2 openssl-devel
libfetch-devel libarchive-devel confuse-devel" libfetch-devel libarchive-devel>=3.1.2 confuse-devel"
conf_files="/etc/xbps/xbps.conf" conf_files="/etc/xbps/xbps.conf"
subpackages="libxbps libxbps-devel xbps-static" subpackages="libxbps libxbps-devel xbps-static"
replaces="xbps>=0" replaces="xbps>=0"
@ -19,11 +19,11 @@ distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
checksum=91e0ae3c6cf807e1f66e45d84c1913d9d87c0eb201ae9c07bc3b4425beba401f checksum=91e0ae3c6cf807e1f66e45d84c1913d9d87c0eb201ae9c07bc3b4425beba401f
crossmakedepends="proplib-devel>=0.6.2 openssl-devel libfetch-devel crossmakedepends="proplib-devel>=0.6.2 openssl-devel libfetch-devel
libarchive-devel confuse-devel" libarchive-devel>=3.1.2 confuse-devel"
if [ -n "$XBPS_CROSS_TRIPLET" ]; then if [ -n "$XBPS_CROSS_TRIPLET" ]; then
subpackages="libxbps libxbps-devel xbps-static" subpackages="libxbps libxbps-devel xbps-static"
makedepends="which pkg-config confuse-devel openssl-devel libarchive-devel" makedepends="which pkg-config confuse-devel openssl-devel libarchive-devel>=3.1.2"
pre_build() { pre_build() {
sed -i "s|-L\$(LIBDIR)|-L/usr/${XBPS_CROSS_TRIPLET}/lib|g" config.mk sed -i "s|-L\$(LIBDIR)|-L/usr/${XBPS_CROSS_TRIPLET}/lib|g" config.mk