From 563953df47785bf57969d86b9b5f8494e585a28c Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Mon, 8 Nov 2010 11:10:56 -0800
Subject: libtool upgrade from 2.2.10 to 2.4

Taking out of this code from patch as the newer upstream code has fix,
and this patch is not needed.

cross-compile.patch:
-Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
+Index: libtool-2.4/libltdl/config/ltmain.m4sh
 ===================================================================
---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
-@@ -5147,8 +5147,14 @@ func_mode_link ()
-           absdir="$abs_ladir"
-           libdir="$abs_ladir"
-         else
--          dir="$libdir"
--          absdir="$libdir"
-+          # Adding 'libdir' from the .la file to our library search
paths
-+          # breaks crosscompilation horribly.  We cheat here and don't
add
-+          # it, instead adding the path where we found the .la.  -CL
-+          dir="$abs_ladir"
-+          absdir="$abs_ladir"
-+          libdir="$abs_ladir"
-+          #dir="$libdir"
-+          #absdir="$libdir"
-         fi
-         test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-       else

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-devtools/python/python-scons-native_1.3.0.bb |  6 ------
 meta/recipes-devtools/python/python-scons-native_2.0.1.bb |  6 ++++++
 meta/recipes-devtools/python/python-scons_1.3.0.bb        | 12 ------------
 meta/recipes-devtools/python/python-scons_2.0.1.bb        | 12 ++++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-scons-native_1.3.0.bb
 create mode 100644 meta/recipes-devtools/python/python-scons-native_2.0.1.bb
 delete mode 100644 meta/recipes-devtools/python/python-scons_1.3.0.bb
 create mode 100644 meta/recipes-devtools/python/python-scons_2.0.1.bb

(limited to 'meta/recipes-devtools/python')

diff --git a/meta/recipes-devtools/python/python-scons-native_1.3.0.bb b/meta/recipes-devtools/python/python-scons-native_1.3.0.bb
deleted file mode 100644
index a4bcd4258..000000000
--- a/meta/recipes-devtools/python/python-scons-native_1.3.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require python-scons_${PV}.bb
-inherit native
-DEPENDS = "python-native"
-RDEPENDS = ""
-PR = "r0"
-
diff --git a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb
new file mode 100644
index 000000000..a4bcd4258
--- /dev/null
+++ b/meta/recipes-devtools/python/python-scons-native_2.0.1.bb
@@ -0,0 +1,6 @@
+require python-scons_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+PR = "r0"
+
diff --git a/meta/recipes-devtools/python/python-scons_1.3.0.bb b/meta/recipes-devtools/python/python-scons_1.3.0.bb
deleted file mode 100644
index f5d11eb92..000000000
--- a/meta/recipes-devtools/python/python-scons_1.3.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "A Software Construction Tool"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-SRCNAME = "scons"
-
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/meta/recipes-devtools/python/python-scons_2.0.1.bb b/meta/recipes-devtools/python/python-scons_2.0.1.bb
new file mode 100644
index 000000000..f5d11eb92
--- /dev/null
+++ b/meta/recipes-devtools/python/python-scons_2.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A Software Construction Tool"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "scons"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
-- 
cgit v1.2.3