• 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/android-tools/0005-fix-static-link-zlib.patch
Thomas PetazzoniThomas Petazzoni committed 9194be9f3ac15 May 2016
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
Fix static linking of adb/adbd
2
​
3
Both adb and adbd use OpenSSL, which indirectly uses zlib. Since
4
adb/adbd also use zlib directly -lz is included in the linker flags,
5
but not at the right position to ensure that static linking works: to
6
make it possible for OpenSSL symbols to see zlib symbols, -lz must
7
appear after -lcrypto.
8
​
9
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
10
​
11
Index: b/debian/makefiles/adb.mk
12
===================================================================
13
--- a/debian/makefiles/adb.mk
14
+++ b/debian/makefiles/adb.mk
15
@@ -41,7 +41,7 @@
16
 CPPFLAGS+= -I$(SRCDIR)/core/adb
17
 CPPFLAGS+= -I$(SRCDIR)/core/include
18
 
19
-LIBS+= -lc -lpthread -lz -lcrypto
20
+LIBS+= -lc -lpthread -lcrypto -lz
21
 
22
 OBJS= $(SRCS:.c=.o)
23
 
24
Index: b/debian/makefiles/adbd.mk
25
===================================================================
26
--- a/debian/makefiles/adbd.mk
27
+++ b/debian/makefiles/adbd.mk
28
@@ -44,7 +44,7 @@
29
 CPPFLAGS+= -I$(SRCDIR)/core/adbd
30
 CPPFLAGS+= -I$(SRCDIR)/core/include
31
 
32
-LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
33
+LIBS+= -lc -lpthread -lcrypto -lz -lcrypt
34
 
35
 OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
36
 
  • 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.