This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository beads.
commit 93df5bcf8ee84f6895daaa6a7bb375f3e45521b3 Author: Juhani Numminen <[email protected]> Date: Sat Oct 21 12:43:48 2017 +0300 Add rpath.patch to disable automatically added rpath --- debian/patches/rpath.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch new file mode 100644 index 0000000..f4b1113 --- /dev/null +++ b/debian/patches/rpath.patch @@ -0,0 +1,25 @@ +Author: Juhani Numminen <[email protected]> +Last-Update: 2017-10-21 +Description: Remove unusual statements, which gets rid of rpath. + There is no directory with the literal name X11_INCLUDE_DIR. + The other statement added -L/usr/include which is not correct. + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -34,7 +34,6 @@ + ELSE(WIN32) + FIND_PACKAGE(X11 REQUIRED) + +- INCLUDE_DIRECTORIES(X11_INCLUDE_DIR) + # X11_FOUND is true if X11 is available. + # * X11_INCLUDE_DIR contains the include directories to use X11. + # * X11_LIBRARIES points to the libraries to link against to use X11. +@@ -44,8 +43,6 @@ + ADD_DEFINITIONS(${PTHREADS_DEFINITIONS}) + # -m -pthread FindThreads + +- # Make sure the linker can find the Hello library once it is built. +- link_directories (${X11_INCLUDE_DIR}) + ENDIF(WIN32) + + diff --git a/debian/patches/series b/debian/patches/series index 4d7a09c..6420dce 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ qt5.patch qt5_headers.patch use_debian_packaged_cimg.h installation.patch +rpath.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beads.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
