diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-13 23:56:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-13 23:56:02 +0000 |
| commit | 20453cf7ece8dd923def7dbd6c2ee3773f19d657 (patch) | |
| tree | 60c1f5afd08d55811fef30ff93339eae2c62ce8f /meta/packages/libtool/libtool-1.5.10 | |
| parent | d9659da1747b69901a4e3b848e8f3c3978665226 (diff) | |
| download | poky-20453cf7ece8dd923def7dbd6c2ee3773f19d657.tar.gz | |
libtool: Don't patch limain.sh otherwise it doesn't regenerate. Drop tag1.patch it doesn't do anything
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3148 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libtool/libtool-1.5.10')
| -rw-r--r-- | meta/packages/libtool/libtool-1.5.10/nousrlib.patch | 22 | ||||
| -rw-r--r-- | meta/packages/libtool/libtool-1.5.10/tag1.patch | 13 |
2 files changed, 0 insertions, 35 deletions
diff --git a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch index 1486337be5..e97b45578d 100644 --- a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch +++ b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch | |||
| @@ -9,25 +9,3 @@ | |||
| 9 | # Try looking first in the location we're being installed to. | 9 | # Try looking first in the location we're being installed to. |
| 10 | if test -n "$inst_prefix_dir"; then | 10 | if test -n "$inst_prefix_dir"; then |
| 11 | case "$libdir" in | 11 | case "$libdir" in |
| 12 | --- libtool-1.5.10.orig/libltdl/ltmain.sh | ||
| 13 | +++ libtool-1.5.10/libltdl/ltmain.sh | ||
| 14 | @@ -2630,8 +2630,6 @@ | ||
| 15 | add="$libdir/$linklib" | ||
| 16 | fi | ||
| 17 | else | ||
| 18 | - # We cannot seem to hardcode it, guess we'll fake it. | ||
| 19 | - add_dir="-L$libdir" | ||
| 20 | # Try looking first in the location we're being installed to. | ||
| 21 | if test -n "$inst_prefix_dir"; then | ||
| 22 | case "$libdir" in | ||
| 23 | --- libtool-1.5.10.orig/ltmain.sh | ||
| 24 | +++ libtool-1.5.10/ltmain.sh | ||
| 25 | @@ -2630,8 +2630,6 @@ | ||
| 26 | add="$libdir/$linklib" | ||
| 27 | fi | ||
| 28 | else | ||
| 29 | - # We cannot seem to hardcode it, guess we'll fake it. | ||
| 30 | - add_dir="-L$libdir" | ||
| 31 | # Try looking first in the location we're being installed to. | ||
| 32 | if test -n "$inst_prefix_dir"; then | ||
| 33 | case "$libdir" in | ||
diff --git a/meta/packages/libtool/libtool-1.5.10/tag1.patch b/meta/packages/libtool/libtool-1.5.10/tag1.patch deleted file mode 100644 index 6fefd6266d..0000000000 --- a/meta/packages/libtool/libtool-1.5.10/tag1.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Index: libtool-1.5.10/libltdl/ltmain.sh | ||
| 2 | =================================================================== | ||
| 3 | --- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100 | ||
| 4 | +++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100 | ||
| 5 | @@ -232,7 +232,7 @@ | ||
| 6 | if test -z "$tagname"; then | ||
| 7 | $echo "$modename: unable to infer tagged configuration" | ||
| 8 | $echo "$modename: specify a tag with \`--tag'" 1>&2 | ||
| 9 | - exit $EXIT_FAILURE | ||
| 10 | +# exit $EXIT_FAILURE | ||
| 11 | # else | ||
| 12 | # $echo "$modename: using $tagname tagged configuration" | ||
| 13 | fi | ||