Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve support for newer msgpack-c releases. #133

Merged
merged 3 commits into from Feb 23, 2020
Merged

Improve support for newer msgpack-c releases. #133

merged 3 commits into from Feb 23, 2020

Conversation

jamessan
Copy link
Contributor

  • Leverage msgpack's pkg-config information when available
  • Enable building against newer (>= 1.2.0) msgpack-c releases,
    which had to make incompatible changes to accomodate changes
    in the msgpack spec itself.

Since 0.5.8, msgpack-c has provided a pkg-config file.  If it's
installed, use pkg-config to get the relevant CFLAGS/LDFLAGS.

Signed-off-by: James McCoy <jamessan@jamessan.com>
In msgpack-c's 1.0.0 release, the code was changed to be compatible with
the v5 msgpack spec, specifically separating out the STR and BIN types
as replacements for the old RAW type.

While the STR type is likely the right replacement type to use, it does
introduce a str 8 variant that wasn't present for the old RAW type.  For
better compatibility, the msgpack_pack_v4raw functions were added to
directly map to the old functionality.

Signed-off-by: James McCoy <jamessan@jamessan.com>
The msgpack library may be present in /usr/lib or /usr/lib/$arch,
but only the former is being searched.  Check both places and fix the
library name to use the C lib (libmsgpackc) rather than the C++ lib
(libmsgpack).

Signed-off-by: James McCoy <jamessan@jamessan.com>
@jamessan
Copy link
Contributor Author

Updated to also look for libmsgpackc in multi-arch library paths for msgpack-c releases which don't yet have pkg-config support (even though those are quite old).

@jamessan
Copy link
Contributor Author

jamessan commented Feb 1, 2017

Ping?

@jollyroger
Copy link
Contributor

@nicolasff do you plan to accept this PR? It provides support for modern versions of the library and makes external patching unnecessary. FYI: Webdis exists in Debian archive with these patches for two years already.

@nicolasff nicolasff merged commit 00b5188 into nicolasff:master Feb 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants