[packages/libdecaf] - added cmake patch, fix export file and include paths
qboosh
qboosh at pld-linux.org
Sat Sep 26 09:43:27 CEST 2020
commit b9dd4f61fd407430f85076db1636c01643c9f10c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Sep 26 09:46:21 2020 +0200
- added cmake patch, fix export file and include paths
libdecaf-cmake.patch | 28 ++++++++++++++++++++++++++++
libdecaf.spec | 5 ++++-
2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/libdecaf.spec b/libdecaf.spec
index 8110584..e77d9e7 100644
--- a/libdecaf.spec
+++ b/libdecaf.spec
@@ -11,7 +11,7 @@ License: MIT
Group: Libraries
Source0: http://downloads.sourceforge.net/ed448goldilocks/%{name}-%{version}.tgz
# Source0-md5: 48b57dc6ff6be56930f0be2a5722a70e
-#Patch0: %{name}-what.patch
+Patch0: %{name}-cmake.patch
URL: http://ed448goldilocks.sourceforge.net/
BuildRequires: cmake >= 3.0
BuildRequires: doxygen
@@ -53,6 +53,7 @@ Statyczna biblioteka decaf.
%prep
%setup -q
+%patch0 -p1
%build
install -d build
@@ -83,6 +84,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libdecaf.so
%{_includedir}/decaf
+%{_includedir}/decaf.h
+%{_includedir}/decaf.hxx
%dir %{_datadir}/decaf
%{_datadir}/decaf/cmake
diff --git a/libdecaf-cmake.patch b/libdecaf-cmake.patch
new file mode 100644
index 0000000..ae9409c
--- /dev/null
+++ b/libdecaf-cmake.patch
@@ -0,0 +1,28 @@
+Recent cmake seems not to populate INTERFACE_INCLUDE_DIRECTORIES when using target_include_directories with empty path list.
+
+Drop duplicate "decaf" from includes path.
+
+--- libdecaf-1.0.0/cmake/DecafConfig.cmake.in.orig 2018-06-06 00:25:08.000000000 +0200
++++ libdecaf-1.0.0/cmake/DecafConfig.cmake.in 2020-09-26 09:22:59.720744590 +0200
+@@ -42,9 +42,7 @@
+ endif()
+ endif()
+ endif()
+-get_target_property(DECAF_INCLUDE_DIRS ${DECAF_TARGETNAME} INTERFACE_INCLUDE_DIRECTORIES)
+-list(INSERT DECAF_INCLUDE_DIRS 0 "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+-list(REMOVE_DUPLICATES DECAF_INCLUDE_DIRS)
++set(DECAF_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+
+ set(DECAF_CPPFLAGS @DECAF_CPPFLAGS@)
+ set(DECAF_FOUND 1)
+--- libdecaf-1.0.0/src/CMakeLists.txt.orig 2018-06-06 00:25:08.000000000 +0200
++++ libdecaf-1.0.0/src/CMakeLists.txt 2020-09-26 09:39:00.252207612 +0200
+@@ -119,7 +119,7 @@
+ endif()
+
+ install(DIRECTORY ${GSOURCE_PATH}/include/
+- DESTINATION include/decaf
++ DESTINATION include
+ FILES_MATCHING PATTERN "*.h*"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdecaf.git/commitdiff/b9dd4f61fd407430f85076db1636c01643c9f10c
More information about the pld-cvs-commit
mailing list