aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 08:43:42 -0700
committerTom Rini <tom_rini@mentor.com>2011-03-16 08:45:43 -0700
commit736cfe81f8a1b17b972d70bf01ca64c3e208f2f8 (patch)
tree3a16f63976b7a92209c9a197b06c9c1163317967
parent4c8e610bd9f2f05e8bfd4e1963f0353aadbfe19e (diff)
downloadopenembedded-736cfe81f8a1b17b972d70bf01ca64c3e208f2f8.tar.gz
tcl: Rework mips-tclstrtod.patch
We can't portably use .. in paths in patches so we stop applying this in do_patch and instead apply it at the start of do_configure. Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r--recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch4
-rw-r--r--recipes/tcltk/tcl_8.5.8.bb3
2 files changed, 4 insertions, 3 deletions
diff --git a/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch b/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch
index b846d0fa82..c7ac8cb0b1 100644
--- a/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch
+++ b/recipes/tcltk/tcl-8.5.8/mips-tclstrtod.patch
@@ -1,7 +1,7 @@
http://sourceforge.net/tracker/index.php?func=detail&aid=2902010&group_id=10894&atid=110894
---- ../generic/tclStrToD.c.orig
-+++ ../generic/tclStrToD.c
+--- generic/tclStrToD.c.orig
++++ generic/tclStrToD.c
@@ -71,9 +71,10 @@
/*
diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb
index e98b98d29d..e088b915a5 100644
--- a/recipes/tcltk/tcl_8.5.8.bb
+++ b/recipes/tcltk/tcl_8.5.8.bb
@@ -13,7 +13,7 @@ SRC_URI = "\
file://tcllibrary.diff;striplevel=2 \
file://tclpackagepath.diff;striplevel=2 \
file://tclprivate.diff;striplevel=2 \
- file://mips-tclstrtod.patch;striplevel=0 \
+ file://mips-tclstrtod.patch;apply=false \
"
SRC_URI[md5sum] = "7f123e53b3daaaba2478d3af5a0752e3"
SRC_URI[sha256sum] = "6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7"
@@ -27,6 +27,7 @@ EXTRA_OECONF = "--enable-threads"
do_configure_append() {
echo > ../compat/fixstrtod.c
+ (cd .. ; patch -p0 -i ${WORKDIR}/mips-tclstrtod.patch)
}
do_compile_prepend_pn-tcl () {