Merge pull request #2343 from dm0-/fix-iproute2

A few iproute2 fixes
This commit is contained in:
David Michael 2017-01-03 15:35:15 -08:00 committed by GitHub
commit 8d594df81e
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,28 @@
--- tc/Makefile
+++ tc/Makefile
@@ -89,7 +89,7 @@
endif
TCOBJ += $(TCMODULES)
-LDLIBS += -L. -ltc -lm
+LDLIBS += -L. -lm
ifeq ($(SHARED_LIBS),y)
LDLIBS += -ldl
@@ -117,12 +117,13 @@
$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
-all: libtc.a tc $(TCSO)
+all: tc $(TCSO)
-tc: $(TCOBJ) $(TCLIB)
+tc: $(TCOBJ) libtc.a
+ $(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
libtc.a: $(TCLIB)
- $(AR) rcs $@ $(TCLIB)
+ $(AR) rcs $@ $^
install: all
mkdir -p $(MODDESTDIR)

View File

@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
epatch "${FILESDIR}"/${PN}-3.19.0-fix-build.patch
sed -i \
-e '/^CC =/d' \