| 1 |
grobian 10/01/27 20:41:27 |
| 2 |
|
| 3 |
Modified: libtool.eclass |
| 4 |
Log: |
| 5 |
Activate Prefix ELT-patches when and where necessary, acked by base-system, bug #301190 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.84 eclass/libtool.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.84&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.84&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.83&r2=1.84 |
| 13 |
|
| 14 |
Index: libtool.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v |
| 17 |
retrieving revision 1.83 |
| 18 |
retrieving revision 1.84 |
| 19 |
diff -u -r1.83 -r1.84 |
| 20 |
--- libtool.eclass 3 May 2009 20:03:10 -0000 1.83 |
| 21 |
+++ libtool.eclass 27 Jan 2010 20:41:27 -0000 1.84 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.83 2009/05/03 20:03:10 loki_val Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.84 2010/01/27 20:41:27 grobian Exp $ |
| 27 |
# |
| 28 |
# Maintainer: base-system@g.o |
| 29 |
# |
| 30 |
@@ -174,11 +174,26 @@ |
| 31 |
[[ ${do_uclibc} == "yes" ]] && \ |
| 32 |
elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" |
| 33 |
|
| 34 |
- [[ ${CHOST} == *"-freebsd"* ]] && \ |
| 35 |
- elt_patches="${elt_patches} fbsd-conf fbsd-ltconf" |
| 36 |
- |
| 37 |
- [[ ${CHOST} == *"-darwin"* ]] && \ |
| 38 |
- elt_patches="${elt_patches} darwin-ltconf darwin-ltmain" |
| 39 |
+ case "${CHOST}" in |
| 40 |
+ *-aix*) |
| 41 |
+ elt_patches="${elt_patches} hardcode aixrtl" |
| 42 |
+ ;; |
| 43 |
+ *-darwin*) |
| 44 |
+ elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf" |
| 45 |
+ ;; |
| 46 |
+ *-freebsd*) |
| 47 |
+ elt_patches="${elt_patches} fbsd-conf fbsd-ltconf" |
| 48 |
+ ;; |
| 49 |
+ *-hpux*) |
| 50 |
+ elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" |
| 51 |
+ ;; |
| 52 |
+ *-irix*) |
| 53 |
+ elt_patches="${elt_patches} irix-ltmain" |
| 54 |
+ ;; |
| 55 |
+ *-mint*) |
| 56 |
+ elt_patches="${elt_patches} mint-conf" |
| 57 |
+ ;; |
| 58 |
+ esac |
| 59 |
|
| 60 |
for x in ${my_dirlist} ; do |
| 61 |
local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") |
| 62 |
@@ -260,6 +275,18 @@ |
| 63 |
ret=$? |
| 64 |
fi |
| 65 |
;; |
| 66 |
+ "darwin-conf") |
| 67 |
+ if [[ -e ${x}/configure && \ |
| 68 |
+ -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then |
| 69 |
+ ELT_walk_patches "${x}/configure" "${y}" |
| 70 |
+ ret=$? |
| 71 |
+ # ltmain.sh and co might be in a subdirectory ... |
| 72 |
+ elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ |
| 73 |
+ -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then |
| 74 |
+ ELT_walk_patches "${x}/../configure" "${y}" |
| 75 |
+ ret=$? |
| 76 |
+ fi |
| 77 |
+ ;; |
| 78 |
"darwin-ltconf") |
| 79 |
# Newer libtoolize clears ltconfig, as not used anymore |
| 80 |
if [[ -s ${x}/ltconfig ]] ; then |
| 81 |
@@ -267,6 +294,32 @@ |
| 82 |
ret=$? |
| 83 |
fi |
| 84 |
;; |
| 85 |
+ "darwin-ltmain") |
| 86 |
+ # special case to avoid false positives (failing to apply |
| 87 |
+ # ltmain.sh path message), newer libtools have this patch |
| 88 |
+ # built in, so not much to patch around then |
| 89 |
+ if [[ -e ${x}/ltmain.sh && \ |
| 90 |
+ -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then |
| 91 |
+ ELT_walk_patches "${x}/ltmain.sh" "${y}" |
| 92 |
+ ret=$? |
| 93 |
+ fi |
| 94 |
+ ;; |
| 95 |
+ "aixrtl" | "hpux-conf" | "mint-conf" ) |
| 96 |
+ ret=1 |
| 97 |
+ local subret=1 |
| 98 |
+ if [[ -e ${x}/configure ]]; then |
| 99 |
+ ELT_walk_patches "${x}/configure" "${y}" |
| 100 |
+ subret=$? |
| 101 |
+ # ltmain.sh and co might be in a subdirectory ... |
| 102 |
+ elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then |
| 103 |
+ ELT_walk_patches "${x}/../configure" "${y}" |
| 104 |
+ subret=$? |
| 105 |
+ fi |
| 106 |
+ if [[ $subret -eq 0 ]]; then |
| 107 |
+ # have at least one patch succeeded. |
| 108 |
+ ret=0 |
| 109 |
+ fi |
| 110 |
+ ;; |
| 111 |
"install-sh") |
| 112 |
ELT_walk_patches "${x}/install-sh" "${y}" |
| 113 |
ret=$? |
Archives