Patchwork [meta-oe] rp-pppoe: discard use of dnl in Makefile.am

login
mail settings
Submitter Ting Liu
Date July 18, 2012, 1:45 p.m.
Message ID <1342619103-12808-1-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/32417/
State Accepted
Commit 4c0420d83090c6bdec8aff94555401d499c696f1
Headers show

Comments

Ting Liu - July 18, 2012, 1:45 p.m.
From: Ting Liu <b28495@freescale.com>

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>
---
 .../discard-use-of-dnl-in-Makefile.am.patch        |   27 ++++++++++++++++++++
 .../recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb  |    3 +-
 2 files changed, 29 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch

Patch

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 0000000..8b78864
--- /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 673633a..7deac84 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"