From 907949e395f7417a63d92bac80c380e4c6624e54 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 17 Nov 2013 07:59:54 +0100 Subject: [PATCH] iptables: disable static to allow building all extensions. --- .../iptables/patches/0503-extension_cppflags.patch | 11 +++++++++++ srcpkgs/iptables/template | 11 +++++------ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/iptables/patches/0503-extension_cppflags.patch diff --git a/srcpkgs/iptables/patches/0503-extension_cppflags.patch b/srcpkgs/iptables/patches/0503-extension_cppflags.patch new file mode 100644 index 00000000000..5ee8409b475 --- /dev/null +++ b/srcpkgs/iptables/patches/0503-extension_cppflags.patch @@ -0,0 +1,11 @@ +--- extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400 ++++ extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400 +@@ -21,7 +21,7 @@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ++AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index d76b2995ac7..4ff834a72ed 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,9 +1,11 @@ # Template file for 'iptables' pkgname=iptables version=1.4.20 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--enable-libipq --enable-shared --enable-static --enable-bpf-compiler" +configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler" +hostmakedepends="pkg-config" +makedepends="libpcap-devel" short_desc="Linux IPv[46] packet filtering ruleset" maintainer="Juan RP " homepage="http://www.netfilter.org/" @@ -11,8 +13,6 @@ license="GPL-2" distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2" checksum=109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad -makedepends="libpcap-devel" - if [ "$CROSS_BUILD" ]; then hostmakedepends="automake libtool gettext-devel pkg-config" pre_configure() { @@ -42,10 +42,9 @@ post_install() { } iptables-devel_package() { - depends="${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/include vmove usr/lib/pkgconfig