summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch68
-rw-r--r--meta/packages/libtool/libtool-2.2.2/cross_compile.patch55
-rw-r--r--meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch17
-rw-r--r--meta/packages/libtool/libtool-2.2.2/libdir-la.patch56
-rw-r--r--meta/packages/libtool/libtool-2.2.2/nousrlib.patch11
-rw-r--r--meta/packages/libtool/libtool-2.2.2/prefix.patch3
-rw-r--r--meta/packages/libtool/libtool-2.2.2/tag.patch14
-rw-r--r--meta/packages/libtool/libtool-2.2.2/uclibc.patch14
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.2.bb9
-rw-r--r--meta/packages/libtool/libtool-native_2.2.2.bb9
-rw-r--r--meta/packages/libtool/libtool_2.2.2.bb8
11 files changed, 135 insertions, 129 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
new file mode 100644
index 0000000000..c8bb6577ab
--- /dev/null
+++ b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
@@ -0,0 +1,68 @@
1From 92e15986a43a8009decffc4d5d290272449487a4 Mon Sep 17 00:00:00 2001
2From: Peter O'Gorman <peter@pogma.com>
3Date: Thu, 1 May 2008 12:40:24 -0500
4Subject: [PATCH] Use AC_CHECK_TOOL for otool and otool64.
5
6* libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
7* libltdl/config/ltmain.m4sh (func_mode_link): Use.
8Reported by Richard Purdie <rpurdie@rpsys.net>
9---
10 ChangeLog | 7 +++++++
11 libltdl/config/ltmain.m4sh | 6 ++----
12 libltdl/m4/libtool.m4 | 6 ++++++
13 3 files changed, 15 insertions(+), 4 deletions(-)
14
15Index: libtool-2.2.2/ChangeLog
16===================================================================
17--- libtool-2.2.2.orig/ChangeLog 2008-05-01 21:34:42.000000000 +0100
18+++ libtool-2.2.2/ChangeLog 2008-05-01 21:35:47.000000000 +0100
19@@ -1,3 +1,10 @@
20+2008-05-01 Peter O'Gorman <peter@pogma.com>
21+
22+ Use AC_CHECK_TOOL for otool and otool64.
23+ * libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
24+ * libltdl/config/ltmain.m4sh (func_mode_link): Use.
25+ Reported by Richard Purdie <rpurdie@rpsys.net>
26+
27 2008-04-01 Gary V. Vaughan <gary@gnu.arg>
28
29 GNU Libtool 2.2.2 was released.
30Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
31===================================================================
32--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:34:42.000000000 +0100
33+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:34:48.000000000 +0100
34@@ -4961,11 +4961,9 @@
35 done
36 if test -f "$absdir/$objdir/$depdepl" ; then
37 depdepl="$absdir/$objdir/$depdepl"
38- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
39- darwin_install_name=`$ECHO $darwin_install_name`
40+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}`
41 if test -z "$darwin_install_name"; then
42- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
43- darwin_install_name=`$ECHO $darwin_install_name`
44+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}`
45 fi
46 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
47 linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
48Index: libtool-2.2.2/libltdl/m4/libtool.m4
49===================================================================
50--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-05-01 21:34:42.000000000 +0100
51+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-05-01 21:36:48.000000000 +0100
52@@ -893,10 +893,16 @@
53 rhapsody* | darwin*)
54 AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
55 AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
56+ AC_CHECK_TOOL([OTOOL], [otool], [:])
57+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
58 _LT_DECL([], [DSYMUTIL], [1],
59 [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
60 _LT_DECL([], [NMEDIT], [1],
61 [Tool to change global to local symbols on Mac OS X])
62+ _LT_DECL([], [OTOOL], [1],
63+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
64+ _LT_DECL([], [OTOOL64], [1],
65+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
66
67 AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
68 [lt_cv_apple_cc_single_mod=no
diff --git a/meta/packages/libtool/libtool-2.2.2/cross_compile.patch b/meta/packages/libtool/libtool-2.2.2/cross_compile.patch
new file mode 100644
index 0000000000..b4bacbd12f
--- /dev/null
+++ b/meta/packages/libtool/libtool-2.2.2/cross_compile.patch
@@ -0,0 +1,55 @@
1Tweaks to make cross-compiling work combined and updated from various
2older patches, some by Chris Larson.
3Not upstreable in this form.
4
5RP - 01/05/2008
6
7Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
8===================================================================
9--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:48:42.000000000 +0100
10+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:51:41.000000000 +0100
11@@ -4454,8 +4454,14 @@
12 absdir="$abs_ladir"
13 libdir="$abs_ladir"
14 else
15- dir="$libdir"
16- absdir="$libdir"
17+ # Adding 'libdir' from the .la file to our library search paths
18+ # breaks crosscompilation horribly. We cheat here and don't add
19+ # it, instead adding the path where we found the .la. -CL
20+ dir="$abs_ladir"
21+ absdir="$abs_ladir"
22+ libdir="$abs_ladir"
23+ #dir="$libdir"
24+ #absdir="$libdir"
25 fi
26 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
27 else
28@@ -4825,8 +4831,6 @@
29 add="$libdir/$linklib"
30 fi
31 else
32- # We cannot seem to hardcode it, guess we'll fake it.
33- add_dir="-L$libdir"
34 # Try looking first in the location we're being installed to.
35 if test -n "$inst_prefix_dir"; then
36 case $libdir in
37@@ -4972,7 +4976,17 @@
38 fi
39 ;;
40 *)
41- path="-L$absdir/$objdir"
42+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
43+ # preferring $objdir. RP 31/04/2008
44+ if test -f "$absdir/$objdir/$depdepl" ; then
45+ depdepl="$absdir/$objdir/$depdepl"
46+ path="-L$absdir/$objdir"
47+ elif test -f "$absdir/$depdepl" ; then
48+ depdepl="$absdir/$depdepl"
49+ path="-L$absdir"
50+ else
51+ path="-L$absdir/$objdir"
52+ fi
53 ;;
54 esac
55 else
diff --git a/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch b/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch
deleted file mode 100644
index 766b520cf2..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
2===================================================================
3--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 12:19:37.000000000 +0100
4+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 12:29:05.000000000 +0100
5@@ -4965,10 +4965,10 @@
6 done
7 if test -f "$absdir/$objdir/$depdepl" ; then
8 depdepl="$absdir/$objdir/$depdepl"
9- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
10+ darwin_install_name=`$host-otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
11 darwin_install_name=`$ECHO $darwin_install_name`
12 if test -z "$darwin_install_name"; then
13- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
14+ darwin_install_name=`$host-otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
15 darwin_install_name=`$ECHO $darwin_install_name`
16 fi
17 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
diff --git a/meta/packages/libtool/libtool-2.2.2/libdir-la.patch b/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
deleted file mode 100644
index 761e69779a..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
2===================================================================
3--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-04-02 01:20:54.000000000 +0100
4+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-04-13 22:32:15.000000000 +0100
5@@ -4453,8 +4453,14 @@
6 absdir="$abs_ladir"
7 libdir="$abs_ladir"
8 else
9- dir="$libdir"
10- absdir="$libdir"
11+ # Adding 'libdir' from the .la file to our library search paths
12+ # breaks crosscompilation horribly. We cheat here and don't add
13+ # it, instead adding the path where we found the .la. -CL
14+ dir="$abs_ladir"
15+ absdir="$abs_ladir"
16+ libdir="$abs_ladir"
17+ #dir="$libdir"
18+ #absdir="$libdir"
19 fi
20 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
21 else
22@@ -4973,10 +4979,22 @@
23 fi
24 ;;
25 *)
26- path="-L$absdir/$objdir"
27+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
28+ # preferring $objdir. RP 31/04/2008
29+ if test -f "$absdir/$objdir/$depdepl" ; then
30+ depdepl="$absdir/$objdir/$depdepl"
31+ path="-L$absdir/$objdir"
32+ elif test -f "$absdir/$depdepl" ; then
33+ depdepl="$absdir/$depdepl"
34+ path="-L$absdir"
35+ else
36+ path="-L$absdir/$objdir"
37+ fi
38 ;;
39 esac
40 else
41+ # This would break cross compiling if we didn't change to installed=no in
42+ # staging. RP 31/04/2008
43 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
44 test -z "$libdir" && \
45 func_fatal_error "\`$deplib' is not a valid libtool archive"
46@@ -7046,6 +7064,10 @@
47 # Replace all uninstalled libtool libraries with the installed ones
48 newdependency_libs=
49 for deplib in $dependency_libs; do
50+ # Replacing uninstalled with installed can easily break crosscompilation,
51+ # since the installed path is generally the wrong architecture. -CL
52+ # newdependency_libs="$newdependency_libs $deplib"
53+ # continue
54 case $deplib in
55 *.la)
56 func_basename "$deplib"
diff --git a/meta/packages/libtool/libtool-2.2.2/nousrlib.patch b/meta/packages/libtool/libtool-2.2.2/nousrlib.patch
deleted file mode 100644
index 5e3e6b9a91..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/nousrlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- libtool-2.2.2/libltdl/config/ltmain.m4sh.orig
2+++ libtool-2.2.2/libltdl/config/ltmain.m4sh
3@@ -2637,8 +2637,6 @@
4 add="$libdir/$linklib"
5 fi
6 else
7- # We cannot seem to hardcode it, guess we'll fake it.
8- add_dir="-L$libdir"
9 # Try looking first in the location we're being installed to.
10 if test -n "$inst_prefix_dir"; then
11 case "$libdir" in
diff --git a/meta/packages/libtool/libtool-2.2.2/prefix.patch b/meta/packages/libtool/libtool-2.2.2/prefix.patch
index d7bdfe1ef4..639feb7456 100644
--- a/meta/packages/libtool/libtool-2.2.2/prefix.patch
+++ b/meta/packages/libtool/libtool-2.2.2/prefix.patch
@@ -1,3 +1,6 @@
1Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure
2it can't be confused with the host libtool.
3
1Index: libtool-2.2.2/libltdl/m4/libtool.m4 4Index: libtool-2.2.2/libltdl/m4/libtool.m4
2=================================================================== 5===================================================================
3--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:43:05.000000000 +0100 6--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:43:05.000000000 +0100
diff --git a/meta/packages/libtool/libtool-2.2.2/tag.patch b/meta/packages/libtool/libtool-2.2.2/tag.patch
deleted file mode 100644
index 327adb4304..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/tag.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
2===================================================================
3--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-04-13 22:40:30.000000000 +0100
4+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-04-13 23:36:53.000000000 +0100
5@@ -842,7 +842,8 @@
6 # line option must be used.
7 if test -z "$tagname"; then
8 func_echo "unable to infer tagged configuration"
9- func_fatal_error "specify a tag with \`--tag'"
10+ func_echo "defaulting to \`CC'"
11+ func_echo "if this is not correct, specify a tag with \`--tag'"
12 # else
13 # func_verbose "using $tagname tagged configuration"
14 fi
diff --git a/meta/packages/libtool/libtool-2.2.2/uclibc.patch b/meta/packages/libtool/libtool-2.2.2/uclibc.patch
deleted file mode 100644
index 8573a01008..0000000000
--- a/meta/packages/libtool/libtool-2.2.2/uclibc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1--- libtool-2.2.2/libltdl/m4/libtool.m4.orig
2+++ libtool-2.2.2/libltdl/m4/libtool.m4
3@@ -2221,6 +2221,11 @@
4 lt_cv_deplibs_check_method=pass_all
5 ;;
6
7+linux-uclibc*)
8+ lt_cv_deplibs_check_method=pass_all
9+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
10+ ;;
11+
12 netbsd*)
13 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
14 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
diff --git a/meta/packages/libtool/libtool-cross_2.2.2.bb b/meta/packages/libtool/libtool-cross_2.2.2.bb
index 6175007232..31b6af2c16 100644
--- a/meta/packages/libtool/libtool-cross_2.2.2.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.2.bb
@@ -1,14 +1,11 @@
1require libtool.inc 1require libtool.inc
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r16" 4PR = "r18"
5PACKAGES = "" 5PACKAGES = ""
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" 6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
7SRC_URI_append = " file://libdir-la.patch;patch=1 \ 7SRC_URI_append = " file://cross_compile.patch;patch=1 \
8 file://prefix.patch;patch=1 \ 8 file://prefix.patch;patch=1"
9# file://sysroot.patch;patch=1 \
10# file://tag.patch;patch=1 \
11 file://nousrlib.patch;patch=1"
12 9
13DOLT_PATCH = "" 10DOLT_PATCH = ""
14DOLT_PATCH_arm = " file://add_dolt.patch;patch=1" 11DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.2.bb
index 3a17c180be..59d9ecadbb 100644
--- a/meta/packages/libtool/libtool-native_2.2.2.bb
+++ b/meta/packages/libtool/libtool-native_2.2.2.bb
@@ -1,13 +1,10 @@
1require libtool.inc 1require libtool.inc
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r14" 4PR = "r16"
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" 5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
6SRC_URI_append = " file://libdir-la.patch;patch=1 \ 6SRC_URI_append = " file://cross_compile.patch;patch=1 \
7 file://prefix.patch;patch=1 \ 7 file://prefix.patch;patch=1"
8# file://sysroot.patch;patch=1 \
9# file://tag.patch;patch=1 \
10 file://nousrlib.patch;patch=1"
11 8
12S = "${WORKDIR}/libtool-${PV}" 9S = "${WORKDIR}/libtool-${PV}"
13 10
diff --git a/meta/packages/libtool/libtool_2.2.2.bb b/meta/packages/libtool/libtool_2.2.2.bb
index 62e0e3f2f7..7bb5945a3a 100644
--- a/meta/packages/libtool/libtool_2.2.2.bb
+++ b/meta/packages/libtool/libtool_2.2.2.bb
@@ -1,15 +1,13 @@
1require libtool.inc 1require libtool.inc
2 2
3PR = "r8" 3PR = "r10"
4 4
5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
6 file://fix_static.patch;patch=1 \ 6 file://fix_static.patch;patch=1;status=merged \
7 file://darwin_fixes.patch;patch=1 \ 7 file://Use-AC_CHECK_TOOL-for-otool-and-otool64.patch;patch=1;status=merged \
8 file://dolt.m4" 8 file://dolt.m4"
9S = "${WORKDIR}/libtool-${PV}" 9S = "${WORKDIR}/libtool-${PV}"
10 10
11#DEFAULT_PREFERENCE = "-1"
12
13PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" 11PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
14FILES_${PN} += "${datadir}/aclocal*" 12FILES_${PN} += "${datadir}/aclocal*"
15FILES_libltdl = "${libdir}/libltdl.so.*" 13FILES_libltdl = "${libdir}/libltdl.so.*"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 21:32:28 +0000