• 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.4.patch
Thomas PetazzoniThomas Petazzoni committed 97703978ac830 Jul 2014
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
--- a/ltmain.sh 2014-07-30 22:21:24.664684143 +0200
2
+++ b/ltmain.sh 2014-07-30 22:23:02.440687625 +0200
3
@@ -1417,8 +1417,8 @@
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
@@ -2963,8 +2963,11 @@
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
@@ -5176,7 +5179,8 @@
29
    ;;
30
       -all-static | -static | -static-libtool-libs)
31
    case $arg in
32
-   -all-static)
33
+   # Make -static behave like -all-static
34
+   -all-static | -static)
35
      if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
36
        func_warning "complete static linking is impossible in this configuration"
37
      fi
38
@@ -5185,12 +5189,6 @@
39
      fi
40
      prefer_static_libs=yes
41
      ;;
42
-   -static)
43
-     if test -z "$pic_flag" && test -n "$link_static_flag"; then
44
-       dlopen_self=$dlopen_self_static
45
-     fi
46
-     prefer_static_libs=built
47
-     ;;
48
    -static-libtool-libs)
49
      if test -z "$pic_flag" && test -n "$link_static_flag"; then
50
        dlopen_self=$dlopen_self_static
51
@@ -5473,7 +5471,8 @@
52
       prevarg="$arg"
53
 
54
       case $arg in
55
-      -all-static)
56
+      # Make -static behave like -all-static
57
+      -all-static | -static)
58
    if test -n "$link_static_flag"; then
59
      # See comment for -static flag below, for more details.
60
      func_append compile_command " $link_static_flag"
61
@@ -5754,7 +5753,7 @@
62
    continue
63
    ;;
64
 
65
-      -static | -static-libtool-libs)
66
+      -static-libtool-libs)
67
    # The effects of -static are defined in a previous loop.
68
    # We used to do the same as -all-static on platforms that
69
    # didn't have a PIC flag, but the assumption that the effects
70
@@ -6697,7 +6696,7 @@
71
      *)
72
        if test "$installed" = no; then
73
          func_append notinst_deplibs " $lib"
74
-         need_relink=yes
75
+         need_relink=no
76
        fi
77
        ;;
78
      esac
79
@@ -9275,6 +9274,10 @@
80
        # Replace all uninstalled libtool libraries with the installed ones
81
        newdependency_libs=
82
        for deplib in $dependency_libs; do
83
+              # Replacing uninstalled with installed can easily break crosscompilation,
84
+              # since the installed path is generally the wrong architecture.  -CL
85
+              newdependency_libs="$newdependency_libs $deplib"
86
+              continue
87
          case $deplib in
88
          *.la)
89
        func_basename "$deplib"
  • 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.