commit: a55bc34dbeda74f9ad1d6b4bf525e1327ec094bc Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Jun 27 09:32:48 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Jun 27 09:36:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55bc34d
dev-cpp/websocketpp: Fix cmake install path Revision bump adds patch by me to fix install paths. Reported-by: Balint SZENTE <balint <AT> szentedwg.ro> Closes: https://bugs.gentoo.org/658096 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../files/websocketpp-0.7.0-cmake-install.patch | 28 ++++++++++++++++ dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild | 39 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dev-cpp/websocketpp/files/websocketpp-0.7.0-cmake-install.patch b/dev-cpp/websocketpp/files/websocketpp-0.7.0-cmake-install.patch new file mode 100644 index 00000000000..4548c650759 --- /dev/null +++ b/dev-cpp/websocketpp/files/websocketpp-0.7.0-cmake-install.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f60caa1..9ff2211 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,13 +15,20 @@ set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSIO + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + ++get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) ++if ("${LIB64}" STREQUAL "TRUE") ++ set(LIBSUFFIX 64) ++else() ++ set(LIBSUFFIX "") ++endif() ++ + set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") ++set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}") + if (WIN32 AND NOT CYGWIN) +- set (DEF_INSTALL_CMAKE_DIR cmake) ++ set (INSTALL_CMAKE_DIR cmake) + else () +- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) ++ set (INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/websocketpp) + endif () +-set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + + # Make relative paths absolute (needed later on) + foreach (p INCLUDE CMAKE) diff --git a/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild b/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild new file mode 100644 index 00000000000..1f3730df214 --- /dev/null +++ b/dev-cpp/websocketpp/websocketpp-0.7.0-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="C++/Boost Asio based websocket client/server library" +HOMEPAGE="http://www.zaphoyd.com/websocketpp"; +SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" +LICENSE="BSD" +SLOT="0" +IUSE="boost examples test" + +DEPEND="" +RDEPEND="${DEPEND} + boost? ( dev-libs/boost ) +" + +# bug 630450 +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-cmake-install.patch" ) + +src_configure() { + local mycmakeargs=( + -DENABLE_CPP11="$(usex !boost)" + -DBUILD_TESTS="$(usex test)" + ) + + cmake-utils_src_configure +} + +src_install() { + use examples && DOCS=( examples/ ) + cmake-utils_src_install +}
