diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-23 16:27:19 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-23 16:27:19 +0000 |
| commit | ef2f93e1711f9b7cdba303ad3bf6af83fbf9d098 (patch) | |
| tree | 73837653f8cc0b78329ed034200c6a479e24c1ec /eclass | |
| parent | Stable on ppc. (diff) | |
| download | historical-ef2f93e1711f9b7cdba303ad3bf6af83fbf9d098.tar.gz historical-ef2f93e1711f9b7cdba303ad3bf6af83fbf9d098.tar.bz2 historical-ef2f93e1711f9b7cdba303ad3bf6af83fbf9d098.zip | |
Add patch to fix kde's fast-install support in libtool, to fix problems reported by truedfx and others.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ELT-patches/kde-fastinstall/3.5.0 | 20 | ||||
| -rw-r--r-- | eclass/libtool.eclass | 9 |
2 files changed, 27 insertions, 2 deletions
diff --git a/eclass/ELT-patches/kde-fastinstall/3.5.0 b/eclass/ELT-patches/kde-fastinstall/3.5.0 new file mode 100644 index 000000000000..8d4e5aa23988 --- /dev/null +++ b/eclass/ELT-patches/kde-fastinstall/3.5.0 @@ -0,0 +1,20 @@ +--- ltmain.sh ++++ ltmain.sh +@@ -3532,7 +3532,7 @@ + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" +- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath" ++ test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then +@@ -5241,7 +5241,7 @@ + + # Directory that this library needs to be installed in: + libdir='$install_libdir'" +- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then ++ if test "$installed" = no && test "$need_relink" = yes; then + $echo >> $output "\ + relink_command=\"$relink_command\"" + fi diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index cafbcd6b491f..6f8e5a2cef31 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.68 2006/04/08 00:46:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.69 2006/04/23 16:27:19 flameeyes Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -127,7 +127,7 @@ elibtoolize() { local do_uclibc="yes" local deptoremove= local my_dirlist= - local elt_patches="portage relink max_cmd_len sed test tmp" + local elt_patches="portage relink max_cmd_len sed test tmp kde-fastinstall" local start_dir=${PWD} my_dirlist=$(ELT_find_ltmain_sh) @@ -335,6 +335,11 @@ elibtoolize() { useq ppc-macos && \ ewarn " Darwin patch set '${y}' failed to apply!" ;; + "kde-fastinstall") + if [[ -n $(grep 'test "$mode" != relink && test "$fast_install" = no' ${x}/ltmain.sh) ]]; then + ewarn "Patch ${y} failed to apply. If you experience build failures, please report this." + fi + ;; esac fi done |