aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2020-06-30 09:26:21 +0800
committerKhem Raj <raj.khem@gmail.com>2020-06-30 07:58:38 -0700
commit1fa024ef8966e264457f0747a061994460fdaf43 (patch)
treeb497e23f22bbaff6a01396c499bdf9f7a572df15
parent20ea67b09a018cc5ee4df80acd09adddbd645335 (diff)
downloadmeta-openembedded-1fa024ef8966e264457f0747a061994460fdaf43.tar.gz
meta-openembedded-1fa024ef8966e264457f0747a061994460fdaf43.tar.bz2
meta-openembedded-1fa024ef8966e264457f0747a061994460fdaf43.zip
docopt.cpp: upgrade 0.6.2 -> 0.6.3
-docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch Removed since this is included in 0.6.3. Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch31
-rw-r--r--meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb5
2 files changed, 2 insertions, 34 deletions
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
deleted file mode 100644
index d4c776569..000000000
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001
-From: Eero Aaltonen <eero.aaltonen@vaisala.com>
-Date: Thu, 20 Jun 2019 16:21:20 +0300
-Subject: [PATCH] Set library VERSION and SOVERSION
-
-With soversion and version specified, `install` target will install the
-library with the specified version and also create the proper symlink.
-
-Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112]
-but unlikely to be merged soon as it is a duplicate of
-[https://github.com/docopt/docopt.cpp/pull/112] which has been **Open**
-since 2016-12-08.
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23da468..feff32e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,10 @@ else()
- set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-
- add_library(docopt SHARED $<TARGET_OBJECTS:docopt_o>)
-+ set_target_properties(docopt PROPERTIES
-+ VERSION ${PROJECT_VERSION}
-+ SOVERSION ${PROJECT_VERSION_MAJOR}
-+ )
- add_library(docopt_s STATIC $<TARGET_OBJECTS:docopt_o>)
- endif()
-
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index aa55ebf84..7a6b0bf95 100644
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -14,12 +14,11 @@ LIC_FILES_CHKSUM = "\
"
DEPENDS = "boost"
-SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917"
-PV = "0.6.2+git${SRCPV}"
+SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196"
+PV = "0.6.3+git${SRCPV}"
SRC_URI = "\
git://github.com/docopt/docopt.cpp.git;protocol=https \
- file://0001-Set-library-VERSION-and-SOVERSION.patch \
"
S = "${WORKDIR}/git"