diff options
| author |   Mathy Vanvoorden <mathy@vanvoorden.be> | 2017-12-01 10:19:14 +0100 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2018-02-20 23:09:21 +0100 |
| commit | c668bef6158b10c416b42b9828b1ab918187b25d (patch) | |
| tree | 3fe22685e9a664de4b52a9bda76bcdc1beaec1c6 /net-libs/zmqpp | |
| parent | app-crypt/keybase: Add kbfs dependency (diff) | |
| download | gentoo-c668bef6158b10c416b42b9828b1ab918187b25d.tar.gz gentoo-c668bef6158b10c416b42b9828b1ab918187b25d.tar.bz2 gentoo-c668bef6158b10c416b42b9828b1ab918187b25d.zip | |
net-libs/zmqpp: fix multilib-strict check failure.
Closes: https://github.com/gentoo/gentoo/pull/6368
Package-Manager: Portage-2.3.14, Repoman-2.3.6
Diffstat (limited to 'net-libs/zmqpp')
| -rw-r--r-- | net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch | 15 | ||||
| -rw-r--r-- | net-libs/zmqpp/zmqpp-4.2.0.ebuild | 4 |
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 |