diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2015-12-19 15:49:33 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2015-12-19 15:59:32 +0000 |
| commit | 62e0925ef3d5cd8072258cbfac969c1bef054982 (patch) | |
| tree | 7f47c6a0e37537508edd7ce1246a4a8cbf13648b /dev-embedded | |
| parent | dev-embedded/libftdi: Fix cmake build issue with USE=examples, bug #566856 (diff) | |
| download | gentoo-62e0925ef3d5cd8072258cbfac969c1bef054982.tar.gz gentoo-62e0925ef3d5cd8072258cbfac969c1bef054982.tar.bz2 gentoo-62e0925ef3d5cd8072258cbfac969c1bef054982.zip | |
dev-embedded/libftdi: Fix version in pkg-config file with USE=-doc
Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch | 38 | ||||
| -rw-r--r-- | dev-embedded/libftdi/libftdi-0.20.ebuild | 2 |
2 files changed, 39 insertions, 1 deletions
diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch new file mode 100644 index 000000000000..1be51da7c1d7 --- /dev/null +++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch @@ -0,0 +1,38 @@ +From e18b700743217e8c505e97762e0f66a4f6a90425 Mon Sep 17 00:00:00 2001 +From: Maciej Grela <maciej.grela@gmail.com> +Date: Wed, 20 Jun 2012 23:08:50 +0200 +Subject: [PATCH] Fix libftdi.pc file generation when building with + -DDOCUMENTATION=OFF + +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c43a48..07f8bb9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,9 @@ + project(libftdi) + set(MAJOR_VERSION 0) + set(MINOR_VERSION 20) ++set(PACKAGE libftdi) + set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) ++set(VERSION ${VERSION_STRING}) + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") + + # CMake +@@ -116,12 +118,11 @@ add_custom_target(dist + + option(DOCUMENTATION "Generate API documentation with Doxygen" ON) + ++ + find_package(Doxygen) + if(DOCUMENTATION AND DOXYGEN_FOUND) + + # Set variables +- set(PACKAGE libftdi) +- set(VERSION ${VERSION_STRING}) + set(top_srcdir ${CMAKE_SOURCE_DIR}) + + # Find doxy config diff --git a/dev-embedded/libftdi/libftdi-0.20.ebuild b/dev-embedded/libftdi/libftdi-0.20.ebuild index acc14c0d6433..fe3eab826422 100644 --- a/dev-embedded/libftdi/libftdi-0.20.ebuild +++ b/dev-embedded/libftdi/libftdi-0.20.ebuild @@ -35,7 +35,7 @@ src_prepare() { -e '/SET(LIB_SUFFIX /d' \ CMakeLists.txt || die - epatch "${FILESDIR}"/${P}-cmake-include.patch + epatch "${FILESDIR}"/${P}-cmake-{include,version}.patch } src_configure() { |