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:30:30 +0100 |
| commit | f005670ee8f6d02e0b0517a48b47b364f0bddf2d (patch) | |
| tree | 3190d81b65228625555a145917074e5def152eb6 /meta/recipes-devtools | |
| parent | 2762ff976a3473be4259889029e048ab8b3be5ab (diff) | |
| download | openembedded-core-f005670ee8f6d02e0b0517a48b47b364f0bddf2d.tar.gz openembedded-core-f005670ee8f6d02e0b0517a48b47b364f0bddf2d.tar.bz2 openembedded-core-f005670ee8f6d02e0b0517a48b47b364f0bddf2d.zip | |
openjade-native: fix build failure
Fix openjade-native build failure when build directory name contains the
characters ".a".
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -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 @@ +From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001 +From: benvm <benvm@yow-gmoffatt-lx2.wrs.com> +Date: Wed, 9 Jan 2013 12:14:06 -0500 +Subject: [PATCH] Fix Makefile regular expression + +This patch modifies a regular expression within a Makefile to stop builds +from failing in the case where the path contains the characters ".a". + +Upstream-Status: Submitted + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + Makefile.prog.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.prog.in b/Makefile.prog.in +index 76310c9..44c3534 100644 +--- a/Makefile.prog.in ++++ b/Makefile.prog.in +@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@ + + ALL_LIBS = $(XLIBS) $(LIBS) + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + +-- +1.7.0.4 + 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 \ file://makefile.patch \ file://msggen.pl.patch \ file://reautoconf.patch \ - file://user-declared-default-constructor.patch" + file://user-declared-default-constructor.patch \ + file://fix-regex.patch" SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" |