Skip to content

Commit

Permalink
libpjsip: fix static build failures due to name clash
Browse files Browse the repository at this point in the history
Several packages have a similar md5.c file, and each has a function
named byteReverse(). This generates link errors when building
statically ("multiple definition of `byteReverse'").

Fix by applying a patch from upstream:
  https://trac.pjsip.org/repos/changeset/5688

Fixes:
  http://autobuild.buildroot.org/results/5d7/5d72e0f8517a555399978d5a0e9f7efd0a278189/
  http://autobuild.buildroot.org/results/c47/c47ccbb9b40011cf0d79c7040bed061ddefd9629/
  http://autobuild.buildroot.org/results/419/419ab2c0e034cc68991281c51caa8271b0fadbab/

Signed-off-by: Luca Ceresoli <[email protected]>
Cc: Adam Duskett <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
  • Loading branch information
lucaceresoli authored and jacmet committed Nov 13, 2017
1 parent dbd9915 commit 8d44fb6
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions package/libpjsip/0001-Fixed-possible-function-name-clash.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Re #2059 (misc): Fixed possible function name clash with md5 due to non-static function.

Backported from: https://trac.pjsip.org/repos/changeset/5688
Signed-off-by: Luca Ceresoli <[email protected]>

Index: pjlib-util/src/pjlib-util/md5.c
===================================================================
diff --git a/pjproject/pjlib-util/src/pjlib-util/md5.c b/pjproject/pjlib-util/src/pjlib-util/md5.c
--- a/pjlib-util/src/pjlib-util/md5.c (revision 5687)
+++ b/pjlib-util/src/pjlib-util/md5.c (revision 5688)
@@ -29,13 +29,13 @@
#ifndef HIGHFIRST
#define byteReverse(buf, len) /* Nothing */
#else
-void byteReverse(unsigned char *buf, unsigned longs);
+static void byteReverse(unsigned char *buf, unsigned longs);

#ifndef ASM_MD5
/*
* Note: this code is harmless on little-endian machines.
*/
-void byteReverse(unsigned char *buf, unsigned longs)
+static void byteReverse(unsigned char *buf, unsigned longs)
{
pj_uint32_t t;
do {

0 comments on commit 8d44fb6

Please sign in to comment.