diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-06-30 09:26:21 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-06-30 07:58:38 -0700 |
commit | 1fa024ef8966e264457f0747a061994460fdaf43 (patch) | |
tree | b497e23f22bbaff6a01396c499bdf9f7a572df15 | |
parent | 20ea67b09a018cc5ee4df80acd09adddbd645335 (diff) | |
download | meta-openembedded-1fa024ef8966e264457f0747a061994460fdaf43.tar.gz |
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.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb | 5 |
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 d4c7765697..0000000000 --- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001 | ||
2 | From: Eero Aaltonen <eero.aaltonen@vaisala.com> | ||
3 | Date: Thu, 20 Jun 2019 16:21:20 +0300 | ||
4 | Subject: [PATCH] Set library VERSION and SOVERSION | ||
5 | |||
6 | With soversion and version specified, `install` target will install the | ||
7 | library with the specified version and also create the proper symlink. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112] | ||
10 | but unlikely to be merged soon as it is a duplicate of | ||
11 | [https://github.com/docopt/docopt.cpp/pull/112] which has been **Open** | ||
12 | since 2016-12-08. | ||
13 | --- | ||
14 | CMakeLists.txt | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
18 | index 23da468..feff32e 100644 | ||
19 | --- a/CMakeLists.txt | ||
20 | +++ b/CMakeLists.txt | ||
21 | @@ -50,6 +50,10 @@ else() | ||
22 | set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) | ||
23 | |||
24 | add_library(docopt SHARED $<TARGET_OBJECTS:docopt_o>) | ||
25 | + set_target_properties(docopt PROPERTIES | ||
26 | + VERSION ${PROJECT_VERSION} | ||
27 | + SOVERSION ${PROJECT_VERSION_MAJOR} | ||
28 | + ) | ||
29 | add_library(docopt_s STATIC $<TARGET_OBJECTS:docopt_o>) | ||
30 | endif() | ||
31 | |||
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 aa55ebf84d..7a6b0bf95d 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 = "\ | |||
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS = "boost" | 16 | DEPENDS = "boost" |
17 | SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917" | 17 | SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196" |
18 | PV = "0.6.2+git${SRCPV}" | 18 | PV = "0.6.3+git${SRCPV}" |
19 | 19 | ||
20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
21 | git://github.com/docopt/docopt.cpp.git;protocol=https \ | 21 | git://github.com/docopt/docopt.cpp.git;protocol=https \ |
22 | file://0001-Set-library-VERSION-and-SOVERSION.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |