diff options
author | Kai Kang <kai.kang@windriver.com> | 2013-06-19 05:05:42 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-25 17:44:53 +0100 |
commit | 1ff6828fe94e0d4f3c6d97b7c6992382767a82e5 (patch) | |
tree | 8f360eabf727f564dbe181abdd87ae0e7cf1efa6 | |
parent | 977fb9a916c1f2f7cb5ceba4db89d2e0155b37a1 (diff) | |
download | poky-1ff6828fe94e0d4f3c6d97b7c6992382767a82e5.tar.gz |
openjade-native: fix build failure
Fix openjade-native build failure when build directory name contains the
characters ".a".
(From OE-Core rev: f005670ee8f6d02e0b0517a48b47b364f0bddf2d)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch new file mode 100644 index 0000000000..6b40afdad8 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001 | ||
2 | From: benvm <benvm@yow-gmoffatt-lx2.wrs.com> | ||
3 | Date: Wed, 9 Jan 2013 12:14:06 -0500 | ||
4 | Subject: [PATCH] Fix Makefile regular expression | ||
5 | |||
6 | This patch modifies a regular expression within a Makefile to stop builds | ||
7 | from failing in the case where the path contains the characters ".a". | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | |||
11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
12 | |||
13 | --- | ||
14 | Makefile.prog.in | 2 +- | ||
15 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.prog.in b/Makefile.prog.in | ||
18 | index 76310c9..44c3534 100644 | ||
19 | --- a/Makefile.prog.in | ||
20 | +++ b/Makefile.prog.in | ||
21 | @@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@ | ||
22 | |||
23 | ALL_LIBS = $(XLIBS) $(LIBS) | ||
24 | Makefile.lt: | ||
25 | - echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt | ||
26 | + echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt | ||
27 | |||
28 | PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') | ||
29 | |||
30 | -- | ||
31 | 1.7.0.4 | ||
32 | |||
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 266210d7c6..8af0b52640 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | |||
@@ -16,7 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ | |||
16 | file://makefile.patch \ | 16 | file://makefile.patch \ |
17 | file://msggen.pl.patch \ | 17 | file://msggen.pl.patch \ |
18 | file://reautoconf.patch \ | 18 | file://reautoconf.patch \ |
19 | file://user-declared-default-constructor.patch" | 19 | file://user-declared-default-constructor.patch \ |
20 | file://fix-regex.patch" | ||
20 | 21 | ||
21 | SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" | 22 | SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" |
22 | SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" | 23 | SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" |