aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/cacao
diff options
context:
space:
mode:
authorErkka Kääriä <erkka.kaaria@intel.com>2015-10-15 13:46:07 +0300
committerMaxin B. John <maxin.john@intel.com>2015-10-15 09:47:55 +0300
commit1bbcc6313150358e5e527bd70e91632a0d420f3c (patch)
tree8a259a86dbe9bca1044b36013d13743e80b9a298 /recipes-core/cacao
parentecd8de1d8a26f3c46a282aafdc48504a31e61e5c (diff)
downloadmeta-java-1bbcc6313150358e5e527bd70e91632a0d420f3c.tar.gz
meta-java-1bbcc6313150358e5e527bd70e91632a0d420f3c.tar.bz2
meta-java-1bbcc6313150358e5e527bd70e91632a0d420f3c.zip
cacao-initial-native: Fix sed matching
The recipe uses sed to patch src/scripts/java.in so that it execs cacao-initial instead of cacao. However, if configure step is run again, -initial is appended again to the string, leading to 'exec cacao-initial-initial'. This causes the build to fail. This is fixed by changing the sed command to consider larger portion of the source string. This ensures that the -initial is only appended once. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/cacao')
-rw-r--r--recipes-core/cacao/cacao-initial-native_0.98.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb
index 72c6246..ec7fbdb 100644
--- a/recipes-core/cacao/cacao-initial-native_0.98.bb
+++ b/recipes-core/cacao/cacao-initial-native_0.98.bb
@@ -35,7 +35,7 @@ export JAR="fastjar"
do_configure_append() {
# Fix the executable name in the wrapper script.
- sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in
+ sed -i -e "s|exec cacao \\$|exec cacao-initial \\$|" src/scripts/java.in
}
SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346"