sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libtool: Avoid relinking when cross compiling, its pointless 

There is no point in having "executable" binaries in the .libs
directory linked with different rpaths to the target which
could concivably be run on the build system when cross compiling.

This patch removes the extra rpaths ($compile_rpath) so that the
output from the "link" stage can be used on the target. We can then
avoid having to "relink" during the install stage.

This saves some build time (do_install is over 2 minutes faster for
pulseaudio).

This patch also removes an annoying "seems to be moved" warning
which is totally bogus in the sysroot case.

(From OE-Core rev: 0a1dedeb8eea4e230b47d1516b3e6e90495fe49d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-11-16 16:58:34 +00:00
parent dc2d701207
commit 61c51bfce9
3 changed files with 105 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-devtools/libtool/libtool-cross_2.4.bb
View File

@ -1,8 +1,9 @@
require libtool-${PV}.inc
PR = "r4"
PR = "r5"
PACKAGES = ""
SRC_URI += "file://prefix.patch"
SRC_URI += "file://fixinstall.patch"
datadir = "${STAGING_DIR_TARGET}${target_datadir}"

3
meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
View File

@ -1,7 +1,8 @@
require libtool-${PV}.inc
PR = "r4"
PR = "r5"
SRC_URI += "file://prefix.patch"
SRC_URI += "file://fixinstall.patch"
inherit nativesdk

101
meta/recipes-devtools/libtool/libtool/fixinstall.patch Normal file
View File

@ -0,0 +1,101 @@
There is no point in having "executable" binaries in the .libs
directory linked with different rpaths to the target which
could concivably be run on the build system when cross compiling.
This patch removes the extra rpaths ($compile_rpath) so that the
output from the "link" stage can be used on the target. We can then
avoid having to "relink" during the install stage.
This saves some build time (do_install is over 2 minutes faster for
pulseaudio).
This patch also removes an annoying "seems to be moved" warning
which is totally bogus in the sysroot case.
Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
RP 2011/11/16
Index: libtool-2.4/libltdl/config/ltmain.m4sh
===================================================================
--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-11-16 14:50:01.070383779 +0000
+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-11-16 15:27:13.582310413 +0000
@@ -2163,7 +2163,7 @@
dir="$func_dirname_result"
func_append dir "$objdir"
- if test -n "$relink_command"; then
+ if test "$fast_install" = no && test -n "$relink_command"; then
# Strip any trailing slash from the destination.
func_stripname '' '/' "$libdir"
destlibdir=$func_stripname_result
@@ -2202,7 +2202,7 @@
shift
srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
@@ -5856,15 +5856,15 @@
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
- case " $sys_lib_dlsearch_path " in
- *" $absdir "*) ;;
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
- esac
- ;;
- esac
+ #case " $sys_lib_dlsearch_path " in
+ #*" $absdir "*) ;;
+ #*)
+ # case "$compile_rpath " in
+ # *" $absdir "*) ;;
+ # *) func_append compile_rpath " $absdir" ;;
+ # esac
+ # ;;
+ #esac
case " $sys_lib_dlsearch_path " in
*" $libdir "*) ;;
*)
@@ -5930,15 +5930,15 @@
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
- case " $sys_lib_dlsearch_path " in
- *" $absdir "*) ;;
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- *) func_append compile_rpath " $absdir" ;;
- esac
- ;;
- esac
+ #case " $sys_lib_dlsearch_path " in
+ #*" $absdir "*) ;;
+ #*)
+ # case "$compile_rpath " in
+ # *" $absdir "*) ;;
+ # *) func_append compile_rpath " $absdir" ;;
+ # esac
+ # ;;
+ #esac
case " $sys_lib_dlsearch_path " in
*" $libdir "*) ;;
*)
@@ -6284,8 +6284,8 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ #test "$absdir" != "$libdir" && \
+ # func_warning "\`$deplib' seems to be moved"
path="-L$absdir"
fi