• 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/package/dmalloc/0004-fix-shlibs.patch
Alex SuykovAlex Suykov committed db7b7fe0ee107 Jan 2015
Raw file
Source viewDiff to previous
 
1
Fix shared library rules
2
​
3
dmalloc uses ld -shared --whole-archive -o lib.so lib.a,
4
but for some reason lists regular objects in addition
5
to the archive, ending up with two copies of each symbol.
6
​
7
Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
8
​
9
--- a/Makefile.in
10
+++ b/Makefile.in
11
@@ -257,7 +257,7 @@ shlib : $(BUILD_SL)
12
 # via: http://256.com/gray/email.html
13
 $(LIB_SL) : $(LIBRARY)
14
    rm -f $@ $@.t
15
-   @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
16
+   @shlinkargs@ $(LIBRARY)
17
    mv $@.t $@
18
 
19
 $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
20
@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
21
 
22
 $(LIB_TH_SL) : $(LIB_TH)
23
    rm -f $@ $@.t
24
-   @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
25
+   @shlinkargs@ $(LIB_TH)
26
    mv $@.t $@
27
 
28
 $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
29
@@ -279,7 +279,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
30
 
31
 $(LIB_CXX_SL) : $(LIB_CXX)
32
    rm -f $@ $@.t
33
-   @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
34
+   @shlinkargs@ $(LIB_CXX)
35
    mv $@.t $@
36
 
37
 $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
38
@@ -288,7 +288,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
39
 
40
 $(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
41
    rm -f $@ $@.t
42
-   @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
43
+   @shlinkargs@ $(LIB_TH_CXX)
44
    mv $@.t $@
45
 
46
 threadssl : $(LIB_TH_SL)
  • 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.