[clfft] 09/12: d/p: add patch restoring install targets deleted upstream
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Oct 28 11:52:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.
commit ed51f9c682ac5359219421428fabacee316a1abc
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Oct 27 19:34:47 2015 +0000
d/p: add patch restoring install targets deleted upstream
---
.../patches/restore-missing-install-targets.patch | 42 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 43 insertions(+)
diff --git a/debian/patches/restore-missing-install-targets.patch b/debian/patches/restore-missing-install-targets.patch
new file mode 100644
index 0000000..d0b3d87
--- /dev/null
+++ b/debian/patches/restore-missing-install-targets.patch
@@ -0,0 +1,42 @@
+Description: Restore missing install targets
+ Upstream disabled / removed important install targets for the client
+ application and pkg-config file. This patch restores them.
+Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Bug: https://github.com/clMathLibraries/clFFT/issues/114
+Forwarded: no
+Last-Update: 2015-10-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/library/CMakeLists.txt
++++ b/src/library/CMakeLists.txt
+@@ -91,13 +91,13 @@
+ set_target_properties( clFFT PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
+ set_target_properties( clFFT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
+
+-# if( CMAKE_COMPILER_IS_GNUCC )
+-# configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
+-# ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
+-#
+-# install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
+-# DESTINATION lib${SUFFIX_LIB}/pkgconfig )
+-# endif( )
++if( CMAKE_COMPILER_IS_GNUCC )
++ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
++ ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
++
++ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
++ DESTINATION lib${SUFFIX_LIB}/pkgconfig )
++endif( )
+
+ # CPack configuration; include the executable into the package
+ install( TARGETS clFFT
+--- a/src/client/CMakeLists.txt
++++ b/src/client/CMakeLists.txt
+@@ -51,3 +51,7 @@
+ set_target_properties( clFFT-client PROPERTIES INSTALL_RPATH "@loader_path/../lib${SUFFIX_LIB}")
+ endif()
+
++install(TARGETS clFFT-client
++ RUNTIME DESTINATION bin${SUFFIX_BIN}
++ LIBRARY DESTINATION lib${SUFFIX_LIB}
++ ARCHIVE DESTINATION lib${SUFFIX_LIB}/import)
diff --git a/debian/patches/series b/debian/patches/series
index 00f4375..8eace2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-docs-output.patch
use-system-mathjax.patch
reproducible-build.patch
use-boost-dynamic-libs.patch
+restore-missing-install-targets.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git
More information about the debian-science-commits
mailing list