diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2021-03-24 16:23:07 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-03-26 10:34:21 -0700 |
| commit | 301a0a2cd930f292a31bdb58b5e66882eff8a3e4 (patch) | |
| tree | 158ffe16757dce7fec2e4989b46336bae29b608b /meta-oe/recipes-devtools | |
| parent | a81380029ef5fa730a292ce203c973fee9e42f6a (diff) | |
| download | meta-openembedded-301a0a2cd930f292a31bdb58b5e66882eff8a3e4.tar.gz | |
tclap: add pkg-config file
The tclap switched from autotools to CMake in 1.4.0 and drop the
pkg-config file tclap.pc. Some projects (e.g. ima-inspect) still
require it. So add it back.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch | 50 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch b/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch new file mode 100644 index 0000000000..58c9aec088 --- /dev/null +++ b/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch @@ -0,0 +1,50 @@ +From 9d47d2fd45c455339759dbfe9a0d6fd24b0a0fa1 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 24 Mar 2021 15:39:36 +0800 +Subject: [PATCH] tclap: add pkg-config file + +The tclap switched from autotools to CMake in 1.4.0 and drop the +pkg-config file tclap.pc. Some projects (e.g. ima-inspect) still require +it. So add it back. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CMakeLists.txt | 5 +++++ + tclap.pc.in | 7 +++++++ + 2 files changed, 12 insertions(+) + create mode 100644 tclap.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2c9a26..b56eac7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,11 @@ install(FILES "${PROJECT_BINARY_DIR}/tclap/TCLAPConfig.h" + DESTINATION include/tclap + ) + ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tclap.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ + add_subdirectory(docs) + add_subdirectory(examples) + add_subdirectory(tests) +diff --git a/tclap.pc.in b/tclap.pc.in +new file mode 100644 +index 0000000..ef51c94 +--- /dev/null ++++ b/tclap.pc.in +@@ -0,0 +1,7 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++Name: tclap ++Description: Templatized C++ Command Line Parser ++Version: @PROJECT_VERSION@ ++Cflags: -I${includedir} +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb index 13f66e47da..7c8224b578 100644 --- a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb +++ b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5c64b2e8cc50917b2744a90950faa7cd" SRCREV = "799a8b1f99818e39fee19d0601030770af1221e1" SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4 \ + file://0001-tclap-add-pkg-config-file.patch \ " S = "${WORKDIR}/git" |