summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-07-13 05:16:47 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-15 13:46:06 +0100
commit2fa0c30375586a61193f3ee1dea308fbc0fd5eb1 (patch)
tree3ba3c0127281ffd941ea3d47f57f5fc7bf085205
parent23363c990c3d1a485fa6f3c7a77ccc58bf325d1d (diff)
downloadpoky-2fa0c30375586a61193f3ee1dea308fbc0fd5eb1.tar.gz
libtool: update patches
As per discussion with RP remove dolt patches. Merge Gary Thomas's patch into trailigslash.patch Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.10.bb10
-rw-r--r--meta/packages/libtool/libtool-native_2.2.10.bb2
-rw-r--r--meta/packages/libtool/libtool-nativesdk_2.2.10.bb2
-rw-r--r--meta/packages/libtool/libtool.inc3
-rw-r--r--meta/packages/libtool/libtool/add_dolt.patch12
-rw-r--r--meta/packages/libtool/libtool/dolt.m4129
-rw-r--r--meta/packages/libtool/libtool/trailingslash.patch12
-rw-r--r--meta/packages/libtool/libtool_2.2.10.bb2
8 files changed, 15 insertions, 157 deletions
diff --git a/meta/packages/libtool/libtool-cross_2.2.10.bb b/meta/packages/libtool/libtool-cross_2.2.10.bb
index a1164c9500..23135f7edb 100644
--- a/meta/packages/libtool/libtool-cross_2.2.10.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.10.bb
@@ -1,19 +1,12 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r0" 3PR = "r1"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI_append = " file://cross_compile.patch \ 5SRC_URI_append = " file://cross_compile.patch \
6 file://prefix.patch " 6 file://prefix.patch "
7 7
8DEPENDS += "libtool-native" 8DEPENDS += "libtool-native"
9 9
10DOLT_PATCH = ""
11DOLT_PATCH_arm = " file://add_dolt.patch"
12DOLT_PATCH_i586 = " file://add_dolt.patch"
13
14#SRC_URI_append_linux = "${DOLT_PATCH}"
15#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
16
17do_configure_prepend () { 10do_configure_prepend () {
18 # Remove any existing libtool m4 since old stale versions would break 11 # Remove any existing libtool m4 since old stale versions would break
19 # any upgrade 12 # any upgrade
@@ -31,7 +24,6 @@ do_install () {
31 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/ 24 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/
32 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/ 25 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/
33 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/ 26 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/
34 install -c -m 0644 ${WORKDIR}/dolt.m4 ${D}${datadir}/aclocal/
35} 27}
36 28
37SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" 29SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
diff --git a/meta/packages/libtool/libtool-native_2.2.10.bb b/meta/packages/libtool/libtool-native_2.2.10.bb
index f10ea8836b..322da4a99b 100644
--- a/meta/packages/libtool/libtool-native_2.2.10.bb
+++ b/meta/packages/libtool/libtool-native_2.2.10.bb
@@ -2,7 +2,7 @@ require libtool_${PV}.bb
2 2
3DEPENDS = "" 3DEPENDS = ""
4 4
5PR = "r0" 5PR = "r1"
6SRC_URI_append = " file://cross_compile.patch \ 6SRC_URI_append = " file://cross_compile.patch \
7 file://prefix.patch " 7 file://prefix.patch "
8 8
diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.10.bb b/meta/packages/libtool/libtool-nativesdk_2.2.10.bb
index c9f24a95bf..e972d9ef3d 100644
--- a/meta/packages/libtool/libtool-nativesdk_2.2.10.bb
+++ b/meta/packages/libtool/libtool-nativesdk_2.2.10.bb
@@ -1,6 +1,6 @@
1require libtool_${PV}.bb 1require libtool_${PV}.bb
2 2
3PR = "r0" 3PR = "r1"
4SRC_URI_append = " file://cross_compile.patch \ 4SRC_URI_append = " file://cross_compile.patch \
5 file://prefix.patch " 5 file://prefix.patch "
6 6
diff --git a/meta/packages/libtool/libtool.inc b/meta/packages/libtool/libtool.inc
index a14068f279..c94dadd0af 100644
--- a/meta/packages/libtool/libtool.inc
+++ b/meta/packages/libtool/libtool.inc
@@ -10,6 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
10 10
11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
12 file://trailingslash.patch \ 12 file://trailingslash.patch \
13 file://prefix-manpage-fix.patch \ 13 file://prefix-manpage-fix.patch "
14 file://dolt.m4 "
15 14
diff --git a/meta/packages/libtool/libtool/add_dolt.patch b/meta/packages/libtool/libtool/add_dolt.patch
deleted file mode 100644
index 2c5df96031..0000000000
--- a/meta/packages/libtool/libtool/add_dolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: libtool-2.2.2/libltdl/m4/libtool.m4
2===================================================================
3--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:40:30.000000000 +0100
4+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-13 23:38:45.000000000 +0100
5@@ -97,6 +97,7 @@
6
7 # Only expand once:
8 m4_define([LT_INIT])
9+DOLT
10 ])# LT_INIT
11
12 # Old names:
diff --git a/meta/packages/libtool/libtool/dolt.m4 b/meta/packages/libtool/libtool/dolt.m4
deleted file mode 100644
index 9bedecf273..0000000000
--- a/meta/packages/libtool/libtool/dolt.m4
+++ /dev/null
@@ -1,129 +0,0 @@
1dnl dolt, a replacement for libtool
2dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
3dnl Copying and distribution of this file, with or without modification,
4dnl are permitted in any medium without royalty provided the copyright
5dnl notice and this notice are preserved.
6dnl
7dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
8dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
9dnl installed when running autoconf on your project.
10
11AC_DEFUN([DOLT], [
12AC_REQUIRE([AC_CANONICAL_HOST])
13# dolt, a replacement for libtool
14# Josh Triplett <josh@freedesktop.org>
15AC_PATH_PROG(DOLT_BASH, bash)
16AC_MSG_CHECKING([if dolt supports this host])
17dolt_supported=yes
18if test x$DOLT_BASH = x; then
19 AC_MSG_ERROR([dolt: Bash not found, fatal error])
20fi
21if test x$GCC != xyes; then
22 AC_MSG_ERROR([dolt: gcc not found, fatal error])
23fi
24case $host in
25i?86-*-linux*|x86_64-*-linux*|arm-*-linux*) ;;
26*) AC_MSG_ERROR([dolt: incompatible host, fatal error]) ;;
27esac
28AC_MSG_RESULT([yes, replacing libtool])
29
30dnl Start writing out doltcompile.
31 cat <<__DOLTCOMPILE__EOF__ >doltcompile
32#!$DOLT_BASH
33__DOLTCOMPILE__EOF__
34 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
35args=("$[]@")
36for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
37 if test x"${args@<:@$arg@:>@}" = x-o ; then
38 objarg=$((arg+1))
39 break
40 fi
41done
42if test x$objarg = x ; then
43 echo 'Error: no -o on compiler command line' 1>&2
44 exit 1
45fi
46lo="${args@<:@$objarg@:>@}"
47obj="${lo%.lo}"
48if test x"$lo" = x"$obj" ; then
49 echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
50 exit 1
51fi
52objbase="${obj##*/}"
53__DOLTCOMPILE__EOF__
54
55dnl Write out shared compilation code.
56 if test x$enable_shared = xyes; then
57 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
58libobjdir="${obj%$objbase}.libs"
59if test ! -d "$libobjdir" ; then
60 mkdir "$libobjdir"
61 mkdir_ret=$?
62 if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
63 exit $mkdir_ret
64 fi
65fi
66pic_object="$libobjdir/$objbase.o"
67args@<:@$objarg@:>@="$pic_object"
68"${args@<:@@@:>@}" -fPIC -DPIC
69__DOLTCOMPILE__EOF__
70 fi
71
72dnl Write out static compilation code.
73dnl Avoid duplicate compiler output if also building shared objects.
74 if test x$enable_static = xyes; then
75 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
76non_pic_object="$obj.o"
77args@<:@$objarg@:>@="$non_pic_object"
78__DOLTCOMPILE__EOF__
79 if test x$enable_shared = xyes; then
80 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
81"${args@<:@@@:>@}" >/dev/null 2>&1
82__DOLTCOMPILE__EOF__
83 else
84 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
85"${args@<:@@@:>@}"
86__DOLTCOMPILE__EOF__
87 fi
88 fi
89
90dnl Write out the code to write the .lo file.
91dnl The second line of the .lo file must match "^# Generated by .*libtool"
92 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
93{
94echo "# $lo - a libtool object file"
95echo "# Generated by doltcompile, not libtool"
96__DOLTCOMPILE__EOF__
97
98 if test x$enable_shared = xyes; then
99 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
100echo "pic_object='$pic_object'"
101__DOLTCOMPILE__EOF__
102 else
103 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
104echo pic_object=none
105__DOLTCOMPILE__EOF__
106 fi
107
108 if test x$enable_static = xyes; then
109 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
110echo "non_pic_object='$non_pic_object'"
111__DOLTCOMPILE__EOF__
112 else
113 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
114echo non_pic_object=none
115__DOLTCOMPILE__EOF__
116 fi
117
118 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
119} > "$lo"
120__DOLTCOMPILE__EOF__
121
122dnl Done writing out doltcompile; substitute it for libtool compilation.
123 chmod +x doltcompile
124 LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
125 AC_SUBST(LTCOMPILE)
126 LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
127 AC_SUBST(LTCXXCOMPILE)
128# end dolt
129])
diff --git a/meta/packages/libtool/libtool/trailingslash.patch b/meta/packages/libtool/libtool/trailingslash.patch
index f51c06406e..313c26291a 100644
--- a/meta/packages/libtool/libtool/trailingslash.patch
+++ b/meta/packages/libtool/libtool/trailingslash.patch
@@ -4,11 +4,16 @@ This is because libdir has a trailing slash which breaks the comparision.
4 4
5RP 2/1/10 5RP 2/1/10
6 6
7Merged a patch received from Gary Thomas <gary@mlbassoc.com>
8
9Date: 2010/07/12
10Nitin A Kamble <nitin.a.kamble@intel.com>
11
7Index: libtool-2.2.10/libltdl/config/ltmain.m4sh 12Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
8=================================================================== 13===================================================================
9--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh 14--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
10+++ libtool-2.2.10/libltdl/config/ltmain.m4sh 15+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
11@@ -1634,8 +1634,12 @@ func_mode_install () 16@@ -1634,8 +1634,15 @@ func_mode_install ()
12 dir="$dir$objdir" 17 dir="$dir$objdir"
13 18
14 if test -n "$relink_command"; then 19 if test -n "$relink_command"; then
@@ -16,9 +21,12 @@ Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
16+ func_stripname '' '/' "$libdir" 21+ func_stripname '' '/' "$libdir"
17+ destlibdir=$func_stripname_result 22+ destlibdir=$func_stripname_result
18+ 23+
24+ func_stripname '' '/' "$destdir"
25+ s_destdir=$func_stripname_result
26+
19 # Determine the prefix the user has applied to our future dir. 27 # Determine the prefix the user has applied to our future dir.
20- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` 28- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
21+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"` 29+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
22 30
23 # Don't allow the user to place us outside of our expected 31 # Don't allow the user to place us outside of our expected
24 # location b/c this prevents finding dependent libraries that 32 # location b/c this prevents finding dependent libraries that
diff --git a/meta/packages/libtool/libtool_2.2.10.bb b/meta/packages/libtool/libtool_2.2.10.bb
index cca3b1ea4a..9eaec2da67 100644
--- a/meta/packages/libtool/libtool_2.2.10.bb
+++ b/meta/packages/libtool/libtool_2.2.10.bb
@@ -1,7 +1,7 @@
1require libtool.inc 1require libtool.inc
2DEPENDS = "libtool-native" 2DEPENDS = "libtool-native"
3 3
4PR = "r0" 4PR = "r1"
5 5
6PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" 6PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
7FILES_${PN} += "${datadir}/aclocal*" 7FILES_${PN} += "${datadir}/aclocal*"