[oe-commits] Vladimir Sorokin : rp-pppoe: fix GNU hash QA error (force LDFLAGS)

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c20fd61ff1f25081c58317eb44e820497792842a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c20fd61ff1f25081c58317eb44e820497792842a

Author: Vladimir Sorokin <sorokin at altell.ru>
Date:   Fri Apr 16 17:57:07 2010 +0400

rp-pppoe: fix GNU hash QA error (force LDFLAGS)

Signed-off-by: Vladimir Sorokin <sorokin at altell.ru>
Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch |   23 +++++++++++++++++++++++
 recipes/rp-pppoe/rp-pppoe_3.8.bb                |    3 ++-
 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 0000000..1209631
--- /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 9a41236..aef080b 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"