From 2427dc2fa1755d2fb20666160b518062fbd36001 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 16 Feb 2013 09:38:09 +0100 Subject: [PATCH] iproute2: update to 3.7.0; cross build support. --- srcpkgs/iproute2/patches/iproute2-fhs.patch | 20 +++++-------- srcpkgs/iproute2/template | 33 +++++++++++++++------ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/srcpkgs/iproute2/patches/iproute2-fhs.patch b/srcpkgs/iproute2/patches/iproute2-fhs.patch index 92ef7f6acc0..2dd89950592 100644 --- a/srcpkgs/iproute2/patches/iproute2-fhs.patch +++ b/srcpkgs/iproute2/patches/iproute2-fhs.patch @@ -1,6 +1,5 @@ -diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile ---- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +--- Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ Makefile 2012-06-18 10:23:53.896760158 +0200 @@ -1,7 +1,8 @@ ROOTDIR=$(DESTDIR) PREFIX=/usr @@ -11,9 +10,8 @@ diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile CONFDIR=/etc/iproute2 DATADIR=$(PREFIX)/share DOCDIR=$(DATADIR)/doc/iproute2 -diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile ---- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200 +--- netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ netem/Makefile 2012-06-18 10:23:53.896760158 +0200 @@ -20,9 +20,9 @@ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm @@ -26,9 +24,8 @@ diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile done clean: -diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile ---- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +--- tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ tc/Makefile 2012-06-18 10:23:53.893426840 +0200 @@ -105,18 +105,11 @@ $(AR) rcs $@ $(TCLIB) @@ -50,9 +47,8 @@ diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile clean: rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ -diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c ---- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 +--- tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 @@ -24,8 +24,8 @@ #include "utils.h" #include "tc_util.h" diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 9d2a6fd9428..a41f49ae1e5 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,19 +1,15 @@ # Template file for 'iproute2' pkgname=iproute2 -version=3.6.0 +version=3.7.0 revision=1 -patch_args="-Np1" -build_style=configure -makedepends="pkg-config perl db-devel flex libnl-devel iptables-devel>=1.4.16.2" +makedepends="pkg-config perl flex db-devel iptables-devel>=1.4.16.2" +crossmakedepends="libfl-devel db-devel iptables-devel>=1.4.16.2" short_desc="IP Routing Utilities" maintainer="Juan RP " homepage="http://www.linux-foundation.org/en/Net:Iproute2" license="GPL-2" distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" -checksum=2d17544da00e3f162139f66891c6ab5492d3cca7cfc8f7b517a5dca3c5560534 -long_desc=" - Iproute2 is a collection of utilities for controlling TCP/IP networking - and traffic control in Linux." +checksum=6b0e76d7adb8b9b65f70571f75d72db7c2548eff7813cace9e267065c3c0cb34 conf_files=" /etc/iproute2/ematch_map @@ -23,7 +19,26 @@ conf_files=" /etc/iproute2/rt_scopes /etc/iproute2/rt_tables" -post_install() { +do_configure() { + ./configure +} + +do_build() { + if [ -n "$XBPS_CROSS_TRIPLET" ]; then + make CC="$XBPS_CROSS_TRIPLET-gcc" \ + RANLIB="$XBPS_CROSS_TRIPLET-ranlib" \ + AR="$XBPS_CROSS_TRIPLET-ar" \ + LD="$XBPS_CROSS_TRIPLET-ld" \ + DBM_INCLUDE="/usr/$XBPS_CROSS_TRIPLET/include" \ + ${makejobs} + else + make ${makejobs} + fi +} + +do_install() { + make DESTDIR=${DESTDIR} install + # Remove tex and sgml files. rm -f ${DESTDIR}/usr/share/doc/iproute2/*.{tex,sgml} # Remove devel manpages.