Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 12 years ago
parent
commit
8c07d0bc07

+ 2 - 1
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:

+ 1 - 1
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"

+ 1 - 0
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