diff options
author | Jesse Zhang <sen.zhang@windriver.com> | 2013-02-28 10:14:02 +0800 |
---|---|---|
committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-03-18 15:13:52 -0400 |
commit | b6070c7f7a42f8a64a7d744a8efe58608843dbcb (patch) | |
tree | 0a25935c33699219548c235847304164efa7b66f /meta-networking | |
parent | 032e8ccfb1aa69e394a3da8f139782b9f1066e7b (diff) | |
download | meta-openembedded-b6070c7f7a42f8a64a7d744a8efe58608843dbcb.tar.gz |
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>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch | 19 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb | 6 |
2 files changed, 23 insertions, 2 deletions
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 000000000..77722b064 --- /dev/null +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | pptp.c and version.c depend on config.h | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | |||
5 | Upstream has already similar fixes. Will be available on next release. | ||
6 | |||
7 | Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> | ||
8 | |||
9 | --- a/Makefile 2013-02-27 17:09:24.431226665 +0800 | ||
10 | +++ b/Makefile 2013-02-27 17:09:03.442075550 +0800 | ||
11 | @@ -43,6 +43,8 @@ | ||
12 | pptpsetup.8: pptpsetup | ||
13 | pod2man $? > $@ | ||
14 | |||
15 | +pptp.o version.o: config.h | ||
16 | + | ||
17 | config.h: | ||
18 | echo "/* text added by Makefile target config.h */" > config.h | ||
19 | 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 ac3f8f664..c173af434 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" | |||
9 | LICENSE = "GPLv2+" | 9 | LICENSE = "GPLv2+" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" |
11 | 11 | ||
12 | PR = "r0" | 12 | PR = "r1" |
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ |
15 | file://options.pptp" | 15 | file://options.pptp \ |
16 | file://fix-parallel-build.patch \ | ||
17 | " | ||
16 | 18 | ||
17 | SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857" | 19 | SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857" |
18 | SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc" | 20 | SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc" |