• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/support/libtool/buildroot-libtool-v2.2.patch
Thomas PetazzoniThomas Petazzoni committed 20f8a7dec6f31 Aug 2011
Raw file
Source viewDiff to previous
 
1
--- a/ltmain.sh 2009-11-16 06:23:18.000000000 -0700
2
+++ b/ltmain.sh 2010-09-18 20:25:06.000000000 -0700
3
@@ -1048,8 +1048,8 @@ func_infer_tag ()
4
    # was found and let the user know that the "--tag" command
5
    # line option must be used.
6
    if test -z "$tagname"; then
7
-     func_echo "unable to infer tagged configuration"
8
-     func_fatal_error "specify a tag with \`--tag'"
9
+     func_echo "defaulting to \`CC'"
10
+     func_echo "if this is not correct, specify a tag with \`--tag'"
11
 #  else
12
 #    func_verbose "using $tagname tagged configuration"
13
    fi
14
@@ -2018,8 +2018,11 @@ func_mode_install ()
15
      # At present, this check doesn't affect windows .dll's that
16
      # are installed into $libdir/../bin (currently, that works fine)
17
      # but it's something to keep an eye on.
18
-     test "$inst_prefix_dir" = "$destdir" && \
19
-       func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
20
+     #
21
+     # This breaks install into our staging area.  -PB
22
+     #
23
+     # test "$inst_prefix_dir" = "$destdir" && \
24
+     #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
25
 
26
      if test -n "$inst_prefix_dir"; then
27
        # Stick the inst_prefix_dir data into the link command.
28
@@ -5412,8 +5415,14 @@ func_mode_link ()
29
        absdir="$abs_ladir"
30
        libdir="$abs_ladir"
31
      else
32
-       dir="$libdir"
33
-       absdir="$libdir"
34
+            # Adding 'libdir' from the .la file to our library search paths
35
+            # breaks crosscompilation horribly.  We cheat here and don't add
36
+            # it, instead adding the path where we found the .la.  -CL
37
+       dir="$abs_ladir"
38
+       absdir="$abs_ladir"
39
+       libdir="$abs_ladir"
40
+       #dir="$libdir"
41
+       #absdir="$libdir"
42
      fi
43
      test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
44
    else
45
@@ -5564,7 +5573,7 @@ func_mode_link ()
46
      *)
47
        if test "$installed" = no; then
48
          notinst_deplibs="$notinst_deplibs $lib"
49
-         need_relink=yes
50
+         need_relink=no
51
        fi
52
        ;;
53
      esac
54
@@ -8052,6 +8061,10 @@ EOF
55
        # Replace all uninstalled libtool libraries with the installed ones
56
        newdependency_libs=
57
        for deplib in $dependency_libs; do
58
+              # Replacing uninstalled with installed can easily break crosscompilation,
59
+              # since the installed path is generally the wrong architecture.  -CL
60
+              newdependency_libs="$newdependency_libs $deplib"
61
+              continue
62
          case $deplib in
63
          *.la)
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.