From 396df79cfafed4e7df5dde0ae71142a172a2a3b8 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 30 Sep 2016 16:41:01 +0200 Subject: [PATCH] open-iscsi: update to 2.0.874. Fix cross. --- srcpkgs/open-iscsi/template | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template index f1457ad0c77..0c81ce7b221 100644 --- a/srcpkgs/open-iscsi/template +++ b/srcpkgs/open-iscsi/template @@ -1,21 +1,31 @@ # Template file for 'open-iscsi' pkgname=open-iscsi -version=2.0.873 -revision=4 +version=2.0.874 +revision=1 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi" +build_style=gnu-configure +hostmakedepends="automake libtool" +makedepends="libmount-devel libisns-devel" short_desc="Open-iSCSI userland tools" maintainer="Christian Neukirchen " license="GPL-2" homepage="http://www.open-iscsi.com/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=c51f6fad45afb7c059f10776de721c6d5fd0336ff927daacea6a7e0a3ad02f18 -nocross=yes +checksum=d0071bf00fdf6591cd6ea5caf89fa57ada03d263da1f80f17deff76acf7419e1 +#nocross=yes +case "$XBPS_TARGET_MACHINE" in + *-musl) CFLAGS+="-D_LINUX_IF_ETHER_H";; +esac post_extract() { - sed -i '1i#include ' utils/open-isns/isns.h sed -i '1i#include ' usr/idbm.c sed -i 's/(__compar_fn_t)//' utils/fwparam_ibft/fwparam_ppc.c sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' utils/Makefile usr/Makefile + sed -i 's,,,g' usr/iscsi_net_util.c + sed -i '1i#include ' iscsiuio/src/unix/libs/bnx2x.c +} +do_configure() { + ( cd iscsiuio && autoreconf -fi && ./configure ${configure_args} ) } do_build() { make ${makejobs} CC="$CC" OPTFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"