[oe-commits] org.oe.dev iptables: Apply patch to use cross ar instead of host ar. (by Cyril Romain)

[florian commit]

iptables: Apply patch to use cross ar instead of host ar. (by Cyril Romain)

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 1bea34eaac3aea9a09f0b2455534a2ad2a66ada3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1bea34eaac3aea9a09f0b2455534a2ad2a66ada3
Files:
1
packages/iptables/files
packages/iptables/files/compile.patch
packages/iptables/iptables_1.2.9.bb
packages/iptables/iptables_1.3.3.bb
Diffs:

#
# mt diff -r6ad5f744a0e10576da1d785da1a1f3f221137399 -r1bea34eaac3aea9a09f0b2455534a2ad2a66ada3
#
# 
# 
# add_dir "packages/iptables/files"
# 
# add_file "packages/iptables/files/compile.patch"
#  content [220c0a0946891a78e50fa4434633bf1fcd0360f6]
# 
# patch "packages/iptables/iptables_1.2.9.bb"
#  from [069a871dedd593807570b45be63734971bdbef6e]
#    to [0c46a81234d39a1bc9bc4bf901685b294a5215df]
# 
# patch "packages/iptables/iptables_1.3.3.bb"
#  from [192df49c91a3251e013969c300c5d96d600e420b]
#    to [20edfcee1eeaec325dbc444dafd0825da523e3b7]
# 
============================================================
--- packages/iptables/files/compile.patch	220c0a0946891a78e50fa4434633bf1fcd0360f6
+++ packages/iptables/files/compile.patch	220c0a0946891a78e50fa4434633bf1fcd0360f6
@@ -0,0 +1,17 @@
+Index: iptables-1.3.3/extensions/Makefile
+===================================================================
+--- iptables-1.3.3.orig/extensions/Makefile
++++ iptables-1.3.3/extensions/Makefile
+@@ -67,10 +67,10 @@ endif
+ 
+ ifdef NO_SHARED_LIBS
+ extensions/libext.a: $(EXT_OBJS)
+-	rm -f $@; ar crv $@ $(EXT_OBJS)
++	rm -f $@; $(AR) crv $@ $(EXT_OBJS)
+ 
+ extensions/libext6.a: $(EXT6_OBJS)
+-	rm -f $@; ar crv $@ $(EXT6_OBJS)
++	rm -f $@; $(AR) crv $@ $(EXT6_OBJS)
+ 
+ extensions/initext.o: extensions/initext.c
+ extensions/initext6.o: extensions/initext6.c
============================================================
--- packages/iptables/iptables_1.2.9.bb	069a871dedd593807570b45be63734971bdbef6e
+++ packages/iptables/iptables_1.2.9.bb	0c46a81234d39a1bc9bc4bf901685b294a5215df
@@ -1,9 +1,10 @@ LICENSE = "GPL"
 SECTION = "console/network"
 DESCRIPTION = "iptables network filtering tools"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
+	   file://compile.patch;patch=1"
 
 S = "${WORKDIR}/iptables-${PV}"
 
============================================================
--- packages/iptables/iptables_1.3.3.bb	192df49c91a3251e013969c300c5d96d600e420b
+++ packages/iptables/iptables_1.3.3.bb	20edfcee1eeaec325dbc444dafd0825da523e3b7
@@ -1,16 +1,17 @@ RRECOMMENDS = "kernel-module-ip-tables k
 DESCRIPTION = "iptables network filtering tools"
 HOMEPAGE = "http://www.netfilter.org/"
 SECTION = "console/utils"
 LICENSE = "GPL"
 RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r3"
+PR = "r4"
 
 
 
 PACKAGES =+ "${PN}-utils"
 FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
 
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
+	   file://compile.patch;patch=1"
 
 S = "${WORKDIR}/iptables-${PV}"