summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl-gentoo@posteo.net>2021-04-03 19:14:47 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-04-04 23:28:05 +0200
commitaf1f8224368ed2ad5dc3fe32a17b4c909076c959 (patch)
treea7023f4cd61c222b6ada635d47877dd61ab77227 /sci-libs/orocos_kdl/files
parentapp-text/kjots: Drop 5.0.2-r2 (diff)
downloadgentoo-af1f8224368ed2ad5dc3fe32a17b4c909076c959.tar.gz
gentoo-af1f8224368ed2ad5dc3fe32a17b4c909076c959.tar.bz2
gentoo-af1f8224368ed2ad5dc3fe32a17b4c909076c959.zip
sci-libs/orocos_kdl: bump to EAPI 7
Port to cmake.eclass using ninja Bugday 2021-04-03 Bug: https://bugs.gentoo.org/770595 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/20248 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/orocos_kdl/files')
-rw-r--r--sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch22
-rw-r--r--sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch27
2 files changed, 49 insertions, 0 deletions
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
new file mode 100644
index 000000000000..d3205b556284
--- /dev/null
+++ b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
@@ -0,0 +1,22 @@
+From 719735a7d36f079f63c4be06bf3118581f628562 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 18:39:42 +0200
+Subject: [PATCH] don't install kdl.tag file
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ doc/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index dcc81b0..cc1774e 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,4 +1,3 @@
+
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" IMMEDIATE @ONLY)
+ ADD_CUSTOM_TARGET(docs "doxygen" "Doxyfile")
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdl.tag DESTINATION share/doc/liborocos-kdl/ OPTIONAL) # only installs if found.
+--
+2.31.1
+
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
new file mode 100644
index 000000000000..fe7eb126f84b
--- /dev/null
+++ b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
@@ -0,0 +1,27 @@
+From 54e66339b734639dc42b63b65a8a4b100f2549c3 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 18:46:42 +0200
+Subject: [PATCH] add LIB_SUFFIX in pkg-config file
+
+Add the LIB_SUFFIX suffix to the libdir variable
+in the kdl.pc.in file.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/kdl.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kdl.pc.in b/src/kdl.pc.in
+index 49e2ab9..1650e2e 100644
+--- a/src/kdl.pc.in
++++ b/src/kdl.pc.in
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${prefix}/lib
++libdir=${prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include
+
+ Name: orocos-kdl
+--
+2.31.1
+