[packages/belr] - added static patch (fix both shared+static build in cmake) - removed outdated pc patch
qboosh
qboosh at pld-linux.org
Wed Jun 16 20:17:19 CEST 2021
commit f0670c688b67a3b56cb62e22bd599b127a022cf2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jun 16 20:20:15 2021 +0200
- added static patch (fix both shared+static build in cmake)
- removed outdated pc patch
belr-pc.patch | 14 --------------
belr-static.patch | 27 +++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/belr-pc.patch b/belr-pc.patch
deleted file mode 100644
index 1ef96a9..0000000
--- a/belr-pc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- belr-0.1.3-0/belr.pc.in.orig 2016-10-19 17:22:25.000000000 +0200
-+++ belr-0.1.3-0/belr.pc.in 2019-06-02 20:53:27.903631254 +0200
-@@ -1,9 +1,9 @@
- # This is a comment
- prefix=@CMAKE_INSTALL_PREFIX@
-
--Name: @PROJECT_NAME@
-+Name: @PACKAGE_NAME@
- Description: Belr is Belledonne Communications' language recognition library
- Version: @PROJECT_VERSION@
- Libs: -L at CMAKE_INSTALL_FULL_LIBDIR@ -lbelr
--Libs.private: @LIBS_PRIVATE@
-+Libs.private: @BCTOOLBOX_LIBS@
- Cflags: -I at CMAKE_INSTALL_FULL_INCLUDEDIR@
diff --git a/belr-static.patch b/belr-static.patch
new file mode 100644
index 0000000..178ba70
--- /dev/null
+++ b/belr-static.patch
@@ -0,0 +1,27 @@
+--- belr-4.5.15/src/CMakeLists.txt.orig 2020-10-22 16:31:51.000000000 +0200
++++ belr-4.5.15/src/CMakeLists.txt 2021-06-15 21:41:34.307278254 +0200
+@@ -44,13 +44,20 @@
+ endif()
+
+ if(ENABLE_STATIC)
+- add_library(belr STATIC ${BELR_HEADER_FILES} ${BELR_SOURCE_FILES_C} ${BELR_SOURCE_FILES_CXX})
+- set_target_properties(belr PROPERTIES OUTPUT_NAME belr)
+- target_link_libraries(belr PUBLIC ${LIBS})
+- target_include_directories(belr INTERFACE
++ add_library(belr-static STATIC ${BELR_HEADER_FILES} ${BELR_SOURCE_FILES_C} ${BELR_SOURCE_FILES_CXX})
++ set_target_properties(belr-static PROPERTIES OUTPUT_NAME belr)
++ target_link_libraries(belr-static PUBLIC ${LIBS})
++ target_include_directories(belr-static INTERFACE
+ $<INSTALL_INTERFACE:include>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+ )
++install(TARGETS belr-static EXPORT ${EXPORT_TARGET_NAME}Targets
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ FRAMEWORK DESTINATION Frameworks
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
++)
+ endif()
+ if(ENABLE_SHARED)
+ add_library(belr SHARED ${BELR_HEADER_FILES} ${BELR_SOURCE_FILES_C} ${BELR_SOURCE_FILES_CXX})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/belr.git/commitdiff/f0670c688b67a3b56cb62e22bd599b127a022cf2
More information about the pld-cvs-commit
mailing list