diff options
| author |   Ting Liu <b28495@freescale.com> | 2012-07-18 13:45:03 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-19 12:11:59 +0200 |
| commit | 4c0420d83090c6bdec8aff94555401d499c696f1 (patch) | |
| tree | b0dbefd652335d319b61df15bf3558025df92da2 /meta-oe/recipes-connectivity | |
| parent | 4712cc5da0ee5239272d377d63f5fb5448beb6bc (diff) | |
| download | meta-openembedded-4c0420d83090c6bdec8aff94555401d499c696f1.tar.gz | |
rp-pppoe: discard use of dnl in Makefile.am
Since Makefile.am is not processed by m4, but by automake, 'dnl' does
not introduce a comment.
Fix the following error: (appearred on opensuse-11.4/fedora-15, which
shipped make with version 3.82)
...
NOTE: package rp-pppoe-3.8-r8: task do_compile: Started
...
| NOTE: make -j 3
| Makefile:640: *** missing separator. Stop.
| ERROR: oe_runmake failed
NOTE: package rp-pppoe-3.8-r8: task do_compile: Failed
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb | 3 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch new file mode 100644 index 0000000000..8b7886485a --- /dev/null +++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch @@ -0,0 +1,27 @@ +From 611c9fe719c5aa264a2ad2eb920cf4522ae2ddec Mon Sep 17 00:00:00 2001 +From: Ting Liu <b28495@freescale.com> +Date: Tue, 12 Jun 2012 14:26:16 -0400 +Subject: [PATCH] discard use of dnl in Makefile.am + +Since Makefile.am is not processed by m4, but by automake, 'dnl' does +not introduce a comment. + +Signed-off-by: Ting Liu <b28495@freescale.com> +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index eff6977..3091c33 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + PACKAGE = rp-pppoe + VERSION = 3.8 + +-dnl AM_CFLAGS = -Wall -DDEBUG ++##dnl AM_CFLAGS = -Wall -DDEBUG + SUBDIRS = src +-- +1.7.6.5 + diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb index 673633a083..7deac84e3a 100644 --- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb +++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" RDEPENDS_${PN} = "ppp" RDEPENDS_${PN}-server = "${PN}" RRECOMMENDS_${PN} = "ppp-oe" -PR = "r8" +PR = "r9" SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ file://top-autoconf.patch \ @@ -14,6 +14,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://discard-use-of-dnl-in-Makefile.am.patch \ file://use-ldflags.patch \ file://pppoe-server.default \ file://pppoe-server.init" |