diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/tclap')
4 files changed, 73 insertions, 47 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch b/meta-openembedded/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch new file mode 100644 index 000000000..58c9aec08 --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch deleted file mode 100644 index 358cbefdd..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c209ed0e7ffca32fe3714bad9cc54bdb00c286bb Mon Sep 17 00:00:00 2001 -From: Ting Liu <b28495@freescale.com> -Date: Mon, 15 Apr 2013 16:28:37 +0800 -Subject: [PATCH] Makefile.am: disable docs - -Upstream-Status: Inappropriate [OE specific] - -docs need some generating tool (for example, doxygen) from host which may -be not available. Disable it to avoid build issue. - -Signed-off-by: Ting Liu <b28495@freescale.com> ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0a6ebc9..6b42f41 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - - ACLOCAL_AMFLAGS = -I config - --SUBDIRS = include examples docs tests msc config -+SUBDIRS = include examples tests msc config - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = $(PACKAGE).pc --- -1.7.5 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb deleted file mode 100644 index bba8d5c21..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Templatized C++ Command Line Parser" -HOMEPAGE = "http://tclap.sourceforge.net/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=0ca8b9c5c5445cfa7af7e78fd27e60ed" - -SRCREV = "ec3ddcfe41b0544a4551a57439b6b3682fe31479" -SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.2 \ - file://Makefile.am-disable-docs.patch \ -" - -S = "${WORKDIR}/git" -inherit autotools - -ALLOW_EMPTY_${PN} = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb new file mode 100644 index 000000000..7c8224b57 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Templatized C++ Command Line Parser" +HOMEPAGE = "http://tclap.sourceforge.net/" +DESCRIPTION = "TCLAP is a small, flexible library that provides a simple interface \ +for defining and accessing command line arguments. It was intially inspired by the \ +user friendly CLAP libary. The difference is that this library is templatized, so \ +the argument class is type independent. Type independence avoids identical-except-for-type \ +objects, such as IntArg, FloatArg, and StringArg. While the library is not strictly \ +compliant with the GNU or POSIX standards, it is close. \ +" +LICENSE = "MIT" +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" +inherit cmake + +ALLOW_EMPTY_${PN} = "1" + +BBCLASSEXTEND = "native nativesdk" |