| Message ID | 1510352189-20531-1-git-send-email-luca@lucaceresoli.net |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | libpjsip: fix static build failures due to name clash | expand |
Hi Luca, On 10-11-17 23:16, Luca Ceresoli wrote: > 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 <luca@lucaceresoli.net> > Cc: Adam Duskett <aduskett@gmail.com> > --- > .../0001-Fixed-possible-function-name-clash.patch | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 package/libpjsip/0001-Fixed-possible-function-name-clash.patch > > diff --git a/package/libpjsip/0001-Fixed-possible-function-name-clash.patch b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch > new file mode 100644 > index 000000000000..80a05ab50a6c > --- /dev/null > +++ b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch > @@ -0,0 +1,21 @@ > +Index: pjlib-util/src/pjlib-util/md5.c > +=================================================================== You forgot to add a commit message and your Sob to the patch. Regards, Arnout > +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 { >
Hi, On 11/11/2017 10:40, Arnout Vandecappelle wrote: > Hi Luca, > > On 10-11-17 23:16, Luca Ceresoli wrote: >> 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 <luca@lucaceresoli.net> >> Cc: Adam Duskett <aduskett@gmail.com> >> --- >> .../0001-Fixed-possible-function-name-clash.patch | 21 +++++++++++++++++++++ >> 1 file changed, 21 insertions(+) >> create mode 100644 package/libpjsip/0001-Fixed-possible-function-name-clash.patch >> >> diff --git a/package/libpjsip/0001-Fixed-possible-function-name-clash.patch b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch >> new file mode 100644 >> index 000000000000..80a05ab50a6c >> --- /dev/null >> +++ b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch >> @@ -0,0 +1,21 @@ >> +Index: pjlib-util/src/pjlib-util/md5.c >> +=================================================================== > > You forgot to add a commit message and your Sob to the patch. My bad, I'm so comfortable with using 'git format-patch' to extract patches that I forget the basics whenever I use a non-git repository... Sorry about that, I just sent v2. Bye,
diff --git a/package/libpjsip/0001-Fixed-possible-function-name-clash.patch b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch new file mode 100644 index 000000000000..80a05ab50a6c --- /dev/null +++ b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch @@ -0,0 +1,21 @@ +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 {
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 <luca@lucaceresoli.net> Cc: Adam Duskett <aduskett@gmail.com> --- .../0001-Fixed-possible-function-name-clash.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/libpjsip/0001-Fixed-possible-function-name-clash.patch