From 576a368b21270ed1b4377b5c0ad8e5c2eddb5bf3 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 24 Jan 2017 11:45:39 +0100 Subject: [PATCH] Fix the install name of the static lib for ctpp2. Patch came unchanged from the debian packaging of ctpp2. --- kiwix-build.py | 2 +- patches/ctpp2_fix-static-libname.patch | 29 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 patches/ctpp2_fix-static-libname.patch diff --git a/kiwix-build.py b/kiwix-build.py index 7e5e56b..9492fdb 100755 --- a/kiwix-build.py +++ b/kiwix-build.py @@ -464,7 +464,7 @@ class CTPP2(Dependency, ReleaseDownloadMixin, CMakeMixin): archive = Remotefile('ctpp2-2.8.3.tar.gz', 'a83ffd07817adb575295ef40fbf759892512e5a63059c520f9062d9ab8fb42fc') 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): diff --git a/patches/ctpp2_fix-static-libname.patch b/patches/ctpp2_fix-static-libname.patch new file mode 100644 index 0000000..21735dc --- /dev/null +++ b/patches/ctpp2_fix-static-libname.patch @@ -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 +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 - 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})