diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2012-03-20 17:46:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-03-20 17:46:45 +0100 |
| commit | 8c07d0bc07ca9cbe373cf41c80d8e10c401aba9e (patch) | |
| tree | fc91f3d267566575c224824fcc65817152f6c06a /package | |
| parent | 422a4e2883ea3be837411b0e65268816e036c087 (diff) | |
| parent | 86468673e6b28848f2f7ba4fa890e960cb5b1b3c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/iptables/Makefile | 3 | ||||
| -rw-r--r-- | package/iptables/patches/patch-ltmain_sh | 2 | ||||
| -rw-r--r-- | package/util-linux/Makefile | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 43c8be732..622415791 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables PKG_VERSION:= 1.4.12.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 212112389c7f10c72efb31a4ed193a4c PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall @@ -33,6 +33,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV})) +TARGET_LDFLAGS+= -fPIC CONFIGURE_ARGS+= --enable-devel iptables-install: diff --git a/package/iptables/patches/patch-ltmain_sh b/package/iptables/patches/patch-ltmain_sh index fa93f8a96..912a59b32 100644 --- a/package/iptables/patches/patch-ltmain_sh +++ b/package/iptables/patches/patch-ltmain_sh @@ -5,7 +5,7 @@ # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto|-fPIC) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index c0dad7d06..ea2bf1820 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= Linux utilities PKG_SECTION:= fs PKG_BUILDDEP:= ncurses PKG_SITES:= ftp://ftp.infradead.org/pub/util-linux/v2.20/ +PKG_NOPARALLEL:= 1 DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 |