Fix the install name of the static lib for ctpp2.

Patch came unchanged from the debian packaging of ctpp2.
This commit is contained in:
Matthieu Gautier 2017-01-24 11:45:39 +01:00
parent 59f2222ef7
commit 576a368b21
2 changed files with 30 additions and 1 deletions

View File

@ -464,7 +464,7 @@ class CTPP2(Dependency, ReleaseDownloadMixin, CMakeMixin):
archive = Remotefile('ctpp2-2.8.3.tar.gz', archive = Remotefile('ctpp2-2.8.3.tar.gz',
'a83ffd07817adb575295ef40fbf759892512e5a63059c520f9062d9ab8fb42fc') 'a83ffd07817adb575295ef40fbf759892512e5a63059c520f9062d9ab8fb42fc')
configure_option = "-DMD5_SUPPORT=OFF" configure_option = "-DMD5_SUPPORT=OFF"
patches = ["ctpp2_include.patch", "ctpp2_no_src_modification.patch"] patches = ["ctpp2_include.patch", "ctpp2_no_src_modification.patch", "ctpp2_fix-static-libname.patch"]
class Pugixml(Dependency, ReleaseDownloadMixin, MesonMixin): class Pugixml(Dependency, ReleaseDownloadMixin, MesonMixin):

View File

@ -0,0 +1,29 @@
Description: Fix the name of static library
Upstream named the static library in unusual way this patch names the
static library in simpler way which suits Debian infrastructure.
Author: Vasudev Kamath <kamathvasudev@gmail.com>
Forwarded: no
Last-Update: 2012-12-19
--- a/ctpp2.spec
+++ b/ctpp2.spec
@@ -60,7 +60,7 @@
%files devel
%defattr(-,root,root,-)
%{_includedir}/ctpp2
-%{_libdir}/libctpp2-st.a
+%{_libdir}/libctpp2.a
%changelog
* Sat Nov 10 2012 Alexander Pankov <pianist@usrsrc.ru> - 2.8.3-0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,7 +426,7 @@
# Lib binary
#
ADD_LIBRARY(ctpp2-static STATIC ${LIBSRCS})
-SET_TARGET_PROPERTIES(ctpp2-static PROPERTIES OUTPUT_NAME ctpp2-st)
+SET_TARGET_PROPERTIES(ctpp2-static PROPERTIES OUTPUT_NAME ctpp2)
SET_TARGET_PROPERTIES(ctpp2-static PROPERTIES LINKER_LANGUAGE CXX)
ADD_LIBRARY(ctpp2 SHARED ${LIBSRCS})