wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-01 18:32:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

iproute2: update to 3.7.0; cross build support.

Browse source
This commit is contained in:
Juan RP 2013-02-16 09:38:09 +01:00
parent 6c2f55322b
commit 2427dc2fa1
2 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/iproute2/patches/iproute2-fhs.patch
View file

@ -1,6 +1,5 @@
diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile --- Makefile 2012-05-21 23:12:19.000000000 +0200
--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 +++ Makefile 2012-06-18 10:23:53.896760158 +0200
+++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
ROOTDIR=$(DESTDIR) ROOTDIR=$(DESTDIR)
PREFIX=/usr PREFIX=/usr
@ -11,9 +10,8 @@ diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
CONFDIR=/etc/iproute2 CONFDIR=/etc/iproute2
DATADIR=$(PREFIX)/share DATADIR=$(PREFIX)/share
DOCDIR=$(DATADIR)/doc/iproute2 DOCDIR=$(DATADIR)/doc/iproute2
diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile --- netem/Makefile 2012-05-21 23:12:19.000000000 +0200
--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 +++ netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm $(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 done
clean: clean:
diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile --- tc/Makefile 2012-05-21 23:12:19.000000000 +0200
--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 +++ tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
@@ -105,18 +105,11 @@ @@ -105,18 +105,11 @@
$(AR) rcs $@ $(TCLIB) $(AR) rcs $@ $(TCLIB)
@ -50,9 +47,8 @@ diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
clean: clean:
rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ 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 --- tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200
--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 +++ tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200
+++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
#include "utils.h" #include "utils.h"
#include "tc_util.h" #include "tc_util.h"

33
srcpkgs/iproute2/template
View file

@ -1,19 +1,15 @@
# Template file for 'iproute2' # Template file for 'iproute2'
pkgname=iproute2 pkgname=iproute2
version=3.6.0 version=3.7.0
revision=1 revision=1
patch_args="-Np1" makedepends="pkg-config perl flex db-devel iptables-devel>=1.4.16.2"
build_style=configure crossmakedepends="libfl-devel db-devel iptables-devel>=1.4.16.2"
makedepends="pkg-config perl db-devel flex libnl-devel iptables-devel>=1.4.16.2"
short_desc="IP Routing Utilities" short_desc="IP Routing Utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.linux-foundation.org/en/Net:Iproute2" homepage="http://www.linux-foundation.org/en/Net:Iproute2"
license="GPL-2" license="GPL-2"
distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
checksum=2d17544da00e3f162139f66891c6ab5492d3cca7cfc8f7b517a5dca3c5560534 checksum=6b0e76d7adb8b9b65f70571f75d72db7c2548eff7813cace9e267065c3c0cb34
long_desc="
Iproute2 is a collection of utilities for controlling TCP/IP networking
and traffic control in Linux."
conf_files=" conf_files="
/etc/iproute2/ematch_map /etc/iproute2/ematch_map
@ -23,7 +19,26 @@ conf_files="
/etc/iproute2/rt_scopes /etc/iproute2/rt_scopes
/etc/iproute2/rt_tables" /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. # Remove tex and sgml files.
rm -f ${DESTDIR}/usr/share/doc/iproute2/*.{tex,sgml} rm -f ${DESTDIR}/usr/share/doc/iproute2/*.{tex,sgml}
# Remove devel manpages. # Remove devel manpages.