summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch15
-rw-r--r--net-libs/zmqpp/zmqpp-4.2.0.ebuild4
2 files changed, 19 insertions, 0 deletions
diff --git a/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
new file mode 100644
index 000000000000..798c028396cb
--- /dev/null
+++ b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489916a..e6ca7d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,8 +231,8 @@ endif()
+ # -------
+ install(TARGETS ${INSTALL_TARGET_LIST}
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ install(DIRECTORY src/zmqpp DESTINATION include/
+ FILES_MATCHING PATTERN "*.hpp")
diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
index e60bfa0f62c0..4eb86e192ea6 100644
--- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild
+++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
@@ -23,6 +23,10 @@ IUSE="static-libs"
DEPEND="net-libs/zeromq[static-libs?]"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-multilib-strict.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DIS_TRAVIS_CI_BUILD=OFF