From da8d6bb8259e23c1e786dbf50aa258ed6c2c2108 Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Mon, 10 Feb 2014 17:36:13 +0100 Subject: [PATCH] xbps: repair cross builds. --- srcpkgs/xbps/template | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 86646ef881..b024fb60f7 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -6,9 +6,6 @@ patch_args="-Np1" bootstrap=yes conf_files="/etc/xbps/xbps.conf" replaces="xbps>=0" -build_style=configure -configure_script="env HAVE_VASPRINTF=1 ./configure" -configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug" makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel" depends="xbps-triggers" short_desc="The XBPS package system utilities" @@ -22,7 +19,6 @@ if [ -z "$CHROOT_READY" ]; then else hostmakedepends="which pkg-config" makedepends+=" atf-devel" - configure_args+=" --enable-tests" xbps-tests_package() { short_desc+=" - Kyua testsuite" @@ -38,6 +34,21 @@ do_fetch() { git clone -b${version} git://github.com/voidlinux/xbps.git xbps-${version} } +do_configure() { + if [ "$CHROOT_READY" ]; then + _args="--enable-tests" + fi + HAVE_VASPRINTF=1 ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug ${_args} +} + +do_build() { + make ${makejobs} +} + +do_install() { + make DESTDIR=${DESTDIR} install +} + libxbps_package() { short_desc+=" - runtime library" replaces="xbps<0.16.3_2 libxbps>=0"