diff --git a/srcpkgs/iproute2/patches/musl.patch b/srcpkgs/iproute2/patches/musl.patch new file mode 100644 index 0000000000..4647f15dc3 --- /dev/null +++ b/srcpkgs/iproute2/patches/musl.patch @@ -0,0 +1,15 @@ +Upstream: No +Reason: FTBFS + +diff --git tc/f_flower.c tc/f_flower.c +index 65fca04..5043907 100644 +--- tc/f_flower.c ++++ tc/f_flower.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "utils.h" + #include "tc_util.h" diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 58f0613141..d84720e88b 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,41 +1,30 @@ # Template file for 'iproute2' pkgname=iproute2 -version=4.16.0 +version=4.20.0 revision=1 +build_style=configure +make_install_args="SBINDIR=/usr/bin" +conf_files=" + /etc/iproute2/ematch_map + /etc/iproute2/rt_dsfield + /etc/iproute2/rt_protos + /etc/iproute2/rt_realms + /etc/iproute2/rt_scopes + /etc/iproute2/rt_tables" hostmakedepends="pkg-config perl flex" makedepends="libfl-devel libmnl-devel db-devel iptables-devel" -conf_files=" - /etc/iproute2/ematch_map - /etc/iproute2/rt_dsfield - /etc/iproute2/rt_protos - /etc/iproute2/rt_realms - /etc/iproute2/rt_scopes - /etc/iproute2/rt_tables" short_desc="IP Routing Utilities" maintainer="Juan RP " -homepage="http://www.linux-foundation.org/en/Net:Iproute2" -license="GPL-2" +license="GPL-2.0-only" +homepage="https://wiki.linuxfoundation.org/networking/iproute2" distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" -checksum=0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a +checksum=c8adaa6a40f888476b23acb283cfa30c0dd55f07b5aa20663ed5ba2ef1f6fda8 -do_configure() { - ./configure - sed -i 's,CCOPTS,HOSTCCOPTS,g' netem/Makefile - sed -i 's/^LDFLAGS +=/override &/' */Makefile -} -do_build() { - make HOSTCC=cc CC="$CC" RANLIB="$RANLIB" AR="$AR" LD="$LD" \ - CCOPTS="$CFLAGS" HOSTCCOPTS="$XBPS_CFLAGS" LDFLAGS="$LDFLAGS" \ - DBM_INCLUDE="$XBPS_CROSS_BASE/usr/include" ${makejobs} -} do_check() { - cd testsuite - - make + make -C testsuite } -do_install() { - make DESTDIR=${DESTDIR} SBINDIR=/usr/bin install +post_install() { rm -r ${DESTDIR}/usr/share/doc rm -r ${DESTDIR}/usr/share/man/man3 }