diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2015-09-28 10:17:13 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-09-28 21:27:48 +0200 |
| commit | 124b3f76dbcd3bde52d1c73514f89e47acbf23eb (patch) | |
| tree | f76e18a594db70051c764df557ebc9e711a55beb | |
| parent | 5c4ea0d8238159019ee0382b024a35b820ce4514 (diff) | |
| download | buildroot-124b3f76dbcd3bde52d1c73514f89e47acbf23eb.tar.gz buildroot-124b3f76dbcd3bde52d1c73514f89e47acbf23eb.zip | |
libstrophe: add a patch to fix static builds
libstrophe.a and libcrypto.a have symbols with equal names, so
executables can't be statically linked with libstrophe and openssl:
sha1dgst.c:(.text+0x1b4c): multiple definition of `SHA1_Update'
sha1dgst.c:(.text+0x1cc0): multiple definition of `SHA1_Final'
sha1dgst.c:(.text+0x1e78): multiple definition of `SHA1_Init
Renaming the internal SHA functions fixes the problem.
Issue reported upstream:
https://github.com/strophe/libstrophe/issues/40
Fixes:
http://autobuild.buildroot.net/results/047/047e319b9d7bf0cdaabc007326a6d67de2c1ee52/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/libstrophe/libstrophe.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index e6eb8346b3..60e29d38c3 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -12,6 +12,7 @@ LIBSTROPHE_AUTORECONF = YES LIBSTROPHE_LICENSE = MIT or GPLv3 LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt LIBSTROPHE_INSTALL_STAGING = YES +LIBSTROPHE_PATCH = https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780.patch ifeq ($(BR2_PACKAGE_EXPAT),y) # Passing --without-libxml2 doesn't work, due to how AC_ARG_WITH is |
