summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 d4c7765697..0000000000
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001
2From: Eero Aaltonen <eero.aaltonen@vaisala.com>
3Date: Thu, 20 Jun 2019 16:21:20 +0300
4Subject: [PATCH] Set library VERSION and SOVERSION
5
6With soversion and version specified, `install` target will install the
7library with the specified version and also create the proper symlink.
8
9Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112]
10but unlikely to be merged soon as it is a duplicate of
11[https://github.com/docopt/docopt.cpp/pull/112] which has been **Open**
12since 2016-12-08.
13---
14 CMakeLists.txt | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/CMakeLists.txt b/CMakeLists.txt
18index 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
16DEPENDS = "boost" 16DEPENDS = "boost"
17SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917" 17SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196"
18PV = "0.6.2+git${SRCPV}" 18PV = "0.6.3+git${SRCPV}"
19 19
20SRC_URI = "\ 20SRC_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
25S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"