summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Sorokin <sorokin@altell.ru>2010-04-16 17:57:07 +0400
committerRoman I Khimov <khimov@altell.ru>2010-06-09 23:52:50 +0400
commitc20fd61ff1f25081c58317eb44e820497792842a (patch)
tree49c940c489e407387d431583e2cd8bd96697ec45
parenteb768a77fb354935eb3eeca57602924122934615 (diff)
rp-pppoe: fix GNU hash QA error (force LDFLAGS)
Signed-off-by: Vladimir Sorokin <sorokin@altell.ru> Signed-off-by: Roman I Khimov <khimov@altell.ru>
-rw-r--r--recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch23
-rw-r--r--recipes/rp-pppoe/rp-pppoe_3.8.bb3
2 files changed, 25 insertions, 1 deletions
diff --git a/recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch b/recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch
new file mode 100644
index 0000000000..120963133c
--- /dev/null
+++ b/recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch
@@ -0,0 +1,23 @@
+--- a/src/Makefile.in 2006-04-02 18:29:42.000000000 +0400
++++ b/src/Makefile.in 2010-04-16 17:51:31.000000000 +0400
+@@ -67,16 +67,16 @@ all: $(TARGETS)
+ @echo "Type 'make install' as root to install the software."
+
+ pppoe-sniff: pppoe-sniff.o if.o common.o debug.o
+- @CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o
++ @CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o $(LDFLAGS)
+
+ pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@
+- @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent
++ @CC@ -o pppoe-server @RDYNAMIC@ pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS) -Llibevent -levent $(LDFLAGS)
+
+ pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
+- @CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o
++ @CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o $(LDFLAGS)
+
+ pppoe-relay: relay.o if.o debug.o common.o
+- @CC@ -o pppoe-relay relay.o if.o debug.o common.o
++ @CC@ -o pppoe-relay relay.o if.o debug.o common.o $(LDFLAGS)
+
+ pppoe.o: pppoe.c pppoe.h
+ @CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c
diff --git a/recipes/rp-pppoe/rp-pppoe_3.8.bb b/recipes/rp-pppoe/rp-pppoe_3.8.bb
index 9a41236211..aef080b90f 100644
--- a/recipes/rp-pppoe/rp-pppoe_3.8.bb
+++ b/recipes/rp-pppoe/rp-pppoe_3.8.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
RDEPENDS_${PN} = "ppp"
RDEPENDS_${PN}-server = "${PN}"
RRECOMMENDS_${PN} = "ppp-oe"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
file://top-autoconf.patch \
@@ -13,6 +13,7 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
file://pppoe-src-restrictions.patch \
file://update-config.patch \
file://dont-swallow-errors.patch \
+ file://use-ldflags.patch \
file://pppoe-server.default \
file://pppoe-server.init"