Re: [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build

[Jesse Zhang <sen.zhang@windriver.com>]

On 02/28/2013 02:23 PM, Khem Raj wrote:
> On Wed, Feb 27, 2013 at 8:31 PM, Jesse Zhang <sen.zhang@windriver.com> wrote:
>> CQID: WIND00405538
> 
> what is this ?

Ah, sorry. Sent from the wrong branch. That's our internal tracking code.

See below for the patch with corrected message.

jesse

From 908296fa5f2bd89c110b1ba072248305b28c3fb6 Mon Sep 17 00:00:00 2001
From: Jesse Zhang <sen.zhang@windriver.com>
Date: Wed, 27 Feb 2013 17:27:12 +0800
Subject: [PATCH] pptp-linux: Add dependency to fix parallel build

Add dependency on the generated config.h file for pptp.c and version.c.

Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
---
 .../pptp-linux-1.7.2/fix-parallel-build.patch         | 19 +++++++++++++++++++
 recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb      |  6 ++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch

diff --git a/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
new file mode 100644
index 0000000..77722b0
--- /dev/null
+++ b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
@@ -0,0 +1,19 @@
+pptp.c and version.c depend on config.h
+
+Upstream-Status: Backport
+
+Upstream has already similar fixes. Will be available on next release.
+
+Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
+
+--- a/Makefile	2013-02-27 17:09:24.431226665 +0800
++++ b/Makefile	2013-02-27 17:09:03.442075550 +0800
+@@ -43,6 +43,8 @@
+ pptpsetup.8: pptpsetup
+ 	pod2man $? > $@
+ 
++pptp.o version.o: config.h
++
+ config.h: 
+ 	echo "/* text added by Makefile target config.h */" > config.h
+ 	echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
diff --git a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
index ac3f8f6..c173af4 100644
--- a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
+++ b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
@@ -9,10 +9,12 @@ SECTION = "network"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
-           file://options.pptp"
+           file://options.pptp \
+           file://fix-parallel-build.patch \
+           "
 
 SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
 SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"
-- 
1.7.11.7