From b6070c7f7a42f8a64a7d744a8efe58608843dbcb Mon Sep 17 00:00:00 2001 From: Jesse Zhang Date: Thu, 28 Feb 2013 10:14:02 +0800 Subject: 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 Signed-off-by: Joe MacDonald --- .../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 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch new file mode 100644 index 0000000000..77722b064d --- /dev/null +++ b/meta-networking/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 + +--- 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/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb index ac3f8f6647..c173af4340 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb +++ b/meta-networking/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" -- cgit 1.2.3-korg