diff --git a/libs/fbzmq/Makefile b/libs/fbzmq/Makefile index f25ed7c76c..ad3d5979a7 100644 --- a/libs/fbzmq/Makefile +++ b/libs/fbzmq/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fbzmq PKG_VERSION:=2019.06.10.00 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/facebook/fbzmq/tar.gz/v$(PKG_VERSION)? @@ -37,6 +37,8 @@ CMAKE_OPTIONS += \ -DTHRIFT1="$(STAGING_DIR_HOSTPKG)/bin/thrift1" \ -DTHRIFT_COMPILER_INCLUDE="$(STAGING_DIR_HOSTPKG)/include/" +TARGET_CXXFLAGS += -faligned-new + define Package/fbzmq/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfbzmq.so* $(1)/usr/lib/ diff --git a/libs/fbzmq/patches/010-move.patch b/libs/fbzmq/patches/010-move.patch new file mode 100644 index 0000000000..a007b66367 --- /dev/null +++ b/libs/fbzmq/patches/010-move.patch @@ -0,0 +1,31 @@ +--- a/fbzmq/zmq/Message.cpp ++++ b/fbzmq/zmq/Message.cpp +@@ -35,7 +35,7 @@ Message::allocate(size_t size) noexcept { + if (rc != 0) { + return folly::makeUnexpected(Error()); + } +- return std::move(msg); ++ return msg; + } + + folly::Expected +@@ -58,7 +58,7 @@ Message::wrapBuffer(std::unique_ptr buf) noexcept { + delete ptr; + return folly::makeUnexpected(Error()); + } +- return std::move(msg); ++ return msg; + } + + Message& +--- a/fbzmq/zmq/Socket.cpp ++++ b/fbzmq/zmq/Socket.cpp +@@ -449,7 +449,7 @@ SocketImpl::recv(int flags) const noexcept { + while (true) { + const int n = zmq_msg_recv(&(msg.msg_), ptr_, flags); + if (n >= 0) { +- return std::move(msg); ++ return msg; + } + + const int err = zmq_errno();