debian/changelog | 4 debian/control | 1 debian/patches/01_use-system-qjson.diff | 121 ------------------------------ debian/patches/02_no_zlib_internals.patch | 73 ------------------ debian/patches/series | 5 - debian/patches/use-system-gtest | 19 ++++ debian/patches/use-system-libbacktrace | 8 + debian/patches/use-system-md5 | 4 debian/patches/use-system-snappy | 83 ++++++++++++++++++++ debian/patches/use-system-snappy.patch | 84 -------------------- 10 files changed, 117 insertions(+), 285 deletions(-)
New commits: commit bd6a1265d43c33c767dcdb437b863e7cdfc5df48 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 13:53:09 2015 +1100 Changelog entry diff --git a/debian/changelog b/debian/changelog index 9697e21..ba1c8d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -apitrace (5.0+repack-1) unstable; urgency=low +apitrace (6.1+git20150626.62ad71c6+repack-1) unstable; urgency=low * Initial release (Closes: #636679) - -- Christopher James Halse Rogers <[email protected]> Sun, 18 May 2014 16:11:32 +1000 + -- Christopher James Halse Rogers <[email protected]> Fri, 26 Jun 2015 17:25:12 +1000 commit 79e72e72ddb549972810e85c4a88d642e8ae43f7 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 13:52:51 2015 +1100 Add DEP-3 headers to patches diff --git a/debian/patches/use-system-gtest b/debian/patches/use-system-gtest index e23436a..f236c22 100644 --- a/debian/patches/use-system-gtest +++ b/debian/patches/use-system-gtest @@ -1,3 +1,7 @@ +Description: Use system libgtest-dev +Forwarded: not-needed +Author: Christopher James Halse Rogers <[email protected]> + --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -465,9 +465,9 @@ diff --git a/debian/patches/use-system-libbacktrace b/debian/patches/use-system-libbacktrace index bf54536..b3cef70 100644 --- a/debian/patches/use-system-libbacktrace +++ b/debian/patches/use-system-libbacktrace @@ -1,3 +1,7 @@ +Description: Use system libbacktrace +Forwarded: not-needed +Author: Christopher James Halse Rogers <[email protected]> + --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -448,8 +448,6 @@ diff --git a/debian/patches/use-system-md5 b/debian/patches/use-system-md5 index 2f6a2f5..116fe02 100644 --- a/debian/patches/use-system-md5 +++ b/debian/patches/use-system-md5 @@ -1,3 +1,7 @@ +Description: Use md5 implementation from system libbsd +Forwarded: not-needed +Author: Christopher James Halse Rogers <[email protected]> + --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,9 +432,7 @@ diff --git a/debian/patches/use-system-snappy b/debian/patches/use-system-snappy index 5d98b57..408091b 100644 --- a/debian/patches/use-system-snappy +++ b/debian/patches/use-system-snappy @@ -1,3 +1,11 @@ +Description: Use system libsnappy for retracers + The tracers run LD_PRELOADed into arbitrary, often closed-source binaries, + so statically-link libsnappy to minimise the possibility of symbol conflicts, + but the retracers don't have that constraint and are used to process untrusted + data. +Forwarded: not-needed +Author: Christopher James Halse Rogers <[email protected]> + --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -403,11 +403,18 @@ commit d943d7b2e78f2640dce9110a89359b9589553680 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 13:42:59 2015 +1100 Standardise patch names diff --git a/debian/patches/series b/debian/patches/series index c6253c4..13e1edd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -use-system-gtest.diff +use-system-gtest use-system-libbacktrace use-system-md5 -use-system-snappy.patch +use-system-snappy diff --git a/debian/patches/use-system-gtest b/debian/patches/use-system-gtest new file mode 100644 index 0000000..e23436a --- /dev/null +++ b/debian/patches/use-system-gtest @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -465,9 +465,9 @@ + include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos) + + # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt +-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/include) +-add_library (gtest ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/src/gtest-all.cc) +-set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest) ++include_directories (/usr/src/gtest/include) ++add_library (gtest /usr/src/gtest/src/gtest-all.cc) ++set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES /usr/src/gtest) + target_link_libraries (gtest ${CMAKE_THREAD_LIBS_INIT}) + + enable_testing () diff --git a/debian/patches/use-system-gtest.diff b/debian/patches/use-system-gtest.diff deleted file mode 100644 index e23436a..0000000 --- a/debian/patches/use-system-gtest.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -465,9 +465,9 @@ - include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos) - - # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt --include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/include) --add_library (gtest ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/src/gtest-all.cc) --set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest) -+include_directories (/usr/src/gtest/include) -+add_library (gtest /usr/src/gtest/src/gtest-all.cc) -+set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES /usr/src/gtest) - target_link_libraries (gtest ${CMAKE_THREAD_LIBS_INIT}) - - enable_testing () diff --git a/debian/patches/use-system-snappy b/debian/patches/use-system-snappy new file mode 100644 index 0000000..5d98b57 --- /dev/null +++ b/debian/patches/use-system-snappy @@ -0,0 +1,75 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -403,11 +403,18 @@ + find_package (SNAPPY) + endif () + if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND) +- set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) +- set (SNAPPY_LIBRARIES snappy_bundled) ++ # We want to use the system snappy for the retracers, as they run on ++ # potentially-untrusted input, but we need static snappy for the ++ # LD_PRELOADed tracers to avoid symbol collisions in the tracee. ++ # ++ # Predictably, the system libsnappy.a is built without PIC, so ++ # useless for us. So do both: find the system libsnappy for the ++ # retracers and and build the bundled libsnappy for the tracers. ++ find_package (SNAPPY REQUIRED) ++ set (SNAPPY_STATIC_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) ++ set (SNAPPY_STATIC_LIBRARIES snappy_bundled) + add_subdirectory (thirdparty/snappy) + endif () +-include_directories (${SNAPPY_INCLUDE_DIRS}) + + if (NOT WIN32) + # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete +--- a/wrappers/CMakeLists.txt ++++ b/wrappers/CMakeLists.txt +@@ -2,6 +2,8 @@ + # API tracers + + ++include_directories (${SNAPPY_STATIC_INCLUDE_DIRS}) ++ + if (ENABLE_STATIC_LIBGCC) + add_linker_flags (-static-libgcc) + endif () +@@ -62,7 +64,7 @@ + ) + target_link_libraries (trace + common +- ${SNAPPY_LIBRARIES} ++ ${SNAPPY_STATIC_LIBRARIES} + ) + + if (WIN32) +--- a/cli/CMakeLists.txt ++++ b/cli/CMakeLists.txt +@@ -14,6 +14,8 @@ + add_definitions (-DAPITRACE_PYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}") + endif () + ++include_directories(${SNAPPY_INCLUDE_DIRS}) ++ + add_executable (apitrace + cli_main.cpp + cli_diff.cpp +--- a/gui/CMakeLists.txt ++++ b/gui/CMakeLists.txt +@@ -82,6 +82,7 @@ + #add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png) + include_directories( + ${CMAKE_SOURCE_DIR} # for image/* ++ ${SNAPPY_INCLUDE_DIRS} + ) + + add_executable (qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H}) +--- a/retrace/CMakeLists.txt ++++ b/retrace/CMakeLists.txt +@@ -8,6 +8,7 @@ + ${CMAKE_SOURCE_DIR}/dispatch + ${CMAKE_SOURCE_DIR}/image + ${CMAKE_SOURCE_DIR}/thirdparty/dxerr ++ ${SNAPPY_INCLUDE_DIRS} + ) + + add_definitions (-DRETRACE) diff --git a/debian/patches/use-system-snappy.patch b/debian/patches/use-system-snappy.patch deleted file mode 100644 index 5d98b57..0000000 --- a/debian/patches/use-system-snappy.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -403,11 +403,18 @@ - find_package (SNAPPY) - endif () - if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND) -- set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) -- set (SNAPPY_LIBRARIES snappy_bundled) -+ # We want to use the system snappy for the retracers, as they run on -+ # potentially-untrusted input, but we need static snappy for the -+ # LD_PRELOADed tracers to avoid symbol collisions in the tracee. -+ # -+ # Predictably, the system libsnappy.a is built without PIC, so -+ # useless for us. So do both: find the system libsnappy for the -+ # retracers and and build the bundled libsnappy for the tracers. -+ find_package (SNAPPY REQUIRED) -+ set (SNAPPY_STATIC_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) -+ set (SNAPPY_STATIC_LIBRARIES snappy_bundled) - add_subdirectory (thirdparty/snappy) - endif () --include_directories (${SNAPPY_INCLUDE_DIRS}) - - if (NOT WIN32) - # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete ---- a/wrappers/CMakeLists.txt -+++ b/wrappers/CMakeLists.txt -@@ -2,6 +2,8 @@ - # API tracers - - -+include_directories (${SNAPPY_STATIC_INCLUDE_DIRS}) -+ - if (ENABLE_STATIC_LIBGCC) - add_linker_flags (-static-libgcc) - endif () -@@ -62,7 +64,7 @@ - ) - target_link_libraries (trace - common -- ${SNAPPY_LIBRARIES} -+ ${SNAPPY_STATIC_LIBRARIES} - ) - - if (WIN32) ---- a/cli/CMakeLists.txt -+++ b/cli/CMakeLists.txt -@@ -14,6 +14,8 @@ - add_definitions (-DAPITRACE_PYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}") - endif () - -+include_directories(${SNAPPY_INCLUDE_DIRS}) -+ - add_executable (apitrace - cli_main.cpp - cli_diff.cpp ---- a/gui/CMakeLists.txt -+++ b/gui/CMakeLists.txt -@@ -82,6 +82,7 @@ - #add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png) - include_directories( - ${CMAKE_SOURCE_DIR} # for image/* -+ ${SNAPPY_INCLUDE_DIRS} - ) - - add_executable (qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H}) ---- a/retrace/CMakeLists.txt -+++ b/retrace/CMakeLists.txt -@@ -8,6 +8,7 @@ - ${CMAKE_SOURCE_DIR}/dispatch - ${CMAKE_SOURCE_DIR}/image - ${CMAKE_SOURCE_DIR}/thirdparty/dxerr -+ ${SNAPPY_INCLUDE_DIRS} - ) - - add_definitions (-DRETRACE) commit b7ac0dd7148c474ae8379caebbf48a9e38f6ce73 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 13:41:50 2015 +1100 Drop obsolete patches diff --git a/debian/patches/01_use-system-qjson.diff b/debian/patches/01_use-system-qjson.diff deleted file mode 100644 index 6a309b9..0000000 --- a/debian/patches/01_use-system-qjson.diff +++ /dev/null @@ -1,121 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -257,23 +257,33 @@ - # - on unices to prevent symbol collisions when tracing applications that link - # against other versions of these libraries - --set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) --set (ZLIB_LIBRARIES z_bundled) --add_subdirectory (thirdparty/zlib) -- -+################## -+# Debian addendum: -+# -+# We statically link these into the tracers to prevent symbol collision, and -+# because it's unlikely to pose a worse security problem than being able to -+# LD_PRELOAD stuff anyway. -+# -+# We dynamically link the GUI and CLI tools against the system libraries, as -+# those tools are potentially exposed to untrustworthy data. -+ -+find_package(PkgConfig REQUIRED) -+ -+include(FindZLIB) -+find_package(ZLIB REQUIRED) -+find_library(ZLIB_STATIC_LIBRARIES libz.a) - include_directories (${ZLIB_INCLUDE_DIRS}) - --set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) --set (SNAPPY_LIBRARIES snappy_bundled) -+# We can't use the system static library until its compiled with -fPIC -+set (SNAPPY_STATIC_LIBRARIES snappy_bundled) - add_subdirectory (thirdparty/snappy) - -+find_path(SNAPPY_INCLUDE_DIRS snappy.h) -+find_library(SNAPPY_LIBRARIES snappy) -+#find_library(SNAPPY_STATIC_LIBRARIES libsnappy.a) - include_directories (${SNAPPY_INCLUDE_DIRS}) - --set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng) --set (PNG_DEFINITIONS "") --set (PNG_LIBRARIES png_bundled) -- --add_subdirectory (thirdparty/libpng) -+pkg_check_modules(PNG REQUIRED libpng12) - - if (MSVC) - add_subdirectory (thirdparty/getopt) -@@ -287,27 +297,15 @@ - endif () - - if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") -- add_subdirectory (thirdparty/libbacktrace) -- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libbacktrace) - set (LIBBACKTRACE_LIBRARIES dl backtrace) - add_definitions (-DHAVE_BACKTRACE=1) - endif () - --add_subdirectory (thirdparty/md5) --set (MD5_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/md5) --set (MD5_LIBRARIES md5_bundled) -- --# Always use bundled QJSon. --# - The packaged versions QJson are very old, and do not support NaN/Infinity. --# - To make it easier to build the GUI on Windows and MacOSX, as there are no --# binaries at all. -+find_library(MD5_LIBRARIES bsd) -+find_path(MD5_INCLUDE_DIR bsd/md5.h) -+ - if (QT4_FOUND) -- add_definitions (-DQJSON_EXPORT=) -- add_subdirectory (thirdparty/qjson) -- set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) -- set (QJSON_LIBRARY_DIRS) -- set (QJSON_LIBRARIES qjson_bundled) -- set (QJSON_FOUND TRUE) -+ find_package(QJSON REQUIRED) - endif () - - # We use bundled headers for all Khronos APIs, to guarantee support for both ---- a/image/image_md5.cpp -+++ b/image/image_md5.cpp -@@ -26,10 +26,14 @@ - - - #include <fstream> -+#include <stdint.h> - #include "image.hpp" - - extern "C" { -- #include "md5.h" -+ typedef uint8_t u_int8_t; -+ typedef uint32_t u_int32_t; -+ typedef uint64_t u_int64_t; -+ #include <bsd/md5.h> - } - - ---- a/wrappers/CMakeLists.txt -+++ b/wrappers/CMakeLists.txt -@@ -405,8 +405,8 @@ - target_link_libraries (glxtrace - glproc_gl - common -- ${ZLIB_LIBRARIES} -- ${SNAPPY_LIBRARIES} -+ ${ZLIB_STATIC_LIBRARIES} -+ ${SNAPPY_STATIC_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - dl - ) -@@ -453,8 +453,8 @@ - target_link_libraries (egltrace - glproc_egl - common -- ${ZLIB_LIBRARIES} -- ${SNAPPY_LIBRARIES} -+ ${ZLIB_STATIC_LIBRARIES} -+ ${SNAPPY_STATIC_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - dl - ) diff --git a/debian/patches/02_no_zlib_internals.patch b/debian/patches/02_no_zlib_internals.patch deleted file mode 100644 index 3db6bb2..0000000 --- a/debian/patches/02_no_zlib_internals.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/common/trace_file_zlib.cpp -+++ b/common/trace_file_zlib.cpp -@@ -31,13 +31,14 @@ - #include <string.h> - - #include <zlib.h> --#include <gzguts.h> - - // for lseek - #ifdef _WIN32 - #include <io.h> - #else - #include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - #include <unistd.h> - #endif - -@@ -69,13 +70,15 @@ - virtual int rawPercentRead(); - private: - gzFile m_gzFile; -+ int fd; - double m_endOffset; - }; - - ZLibFile::ZLibFile(const std::string &filename, - File::Mode mode) - : File(filename, mode), -- m_gzFile(NULL) -+ m_gzFile(NULL), -+ fd(-1) - { - } - -@@ -86,18 +89,15 @@ - - bool ZLibFile::rawOpen(const std::string &filename, File::Mode mode) - { -- m_gzFile = gzopen(filename.c_str(), -+ fd = ::open(filename.c_str(), -+ (mode == File::Write) ? O_WRONLY : O_RDONLY); -+ m_gzFile = gzdopen(fd, - (mode == File::Write) ? "wb" : "rb"); - - if (mode == File::Read && m_gzFile) { -- //XXX: unfortunately zlib doesn't support -- // SEEK_END or we could've done: -- //m_endOffset = gzseek(m_gzFile, 0, SEEK_END); -- //gzrewind(m_gzFile); -- gz_state *state = (gz_state *)m_gzFile; -- off_t loc = lseek(state->fd, 0, SEEK_CUR); -- m_endOffset = lseek(state->fd, 0, SEEK_END); -- lseek(state->fd, loc, SEEK_SET); -+ off_t loc = lseek(fd, 0, SEEK_CUR); -+ m_endOffset = lseek(fd, 0, SEEK_END); -+ lseek(fd, loc, SEEK_SET); - } - - return m_gzFile != NULL; -@@ -149,11 +149,9 @@ - - int ZLibFile::rawPercentRead() - { -- gz_state *state = (gz_state *)m_gzFile; -- return int(100 * (lseek(state->fd, 0, SEEK_CUR) / m_endOffset)); -+ return int(100 * (lseek(fd, 0, SEEK_CUR) / m_endOffset)); - } - -- - File * File::createZLib(void) { - return new ZLibFile; - } diff --git a/debian/patches/series b/debian/patches/series index 491eced..c6253c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -#01_use-system-qjson.diff -#02_no_zlib_internals.patch use-system-gtest.diff use-system-libbacktrace use-system-md5 commit 748cf6d97f49048a3f46bfd0bb56ac1196682f1f Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 11:15:18 2015 +1100 Add use-system-gtest.diff diff --git a/debian/control b/debian/control index f71c835..bbfb447 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: libpng12-dev, libbsd-dev, libprocps-dev, + libgtest-dev, Standards-Version: 3.9.5 Homepage: https://apitrace.github.io Vcs-Git: git://git.debian.org/pkg-xorg/app/apitrace.git diff --git a/debian/patches/series b/debian/patches/series index 65cc1b9..491eced 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ #01_use-system-qjson.diff #02_no_zlib_internals.patch +use-system-gtest.diff use-system-libbacktrace use-system-md5 use-system-snappy.patch diff --git a/debian/patches/use-system-gtest.diff b/debian/patches/use-system-gtest.diff new file mode 100644 index 0000000..e23436a --- /dev/null +++ b/debian/patches/use-system-gtest.diff @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -465,9 +465,9 @@ + include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos) + + # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt +-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/include) +-add_library (gtest ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/src/gtest-all.cc) +-set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest) ++include_directories (/usr/src/gtest/include) ++add_library (gtest /usr/src/gtest/src/gtest-all.cc) ++set_property (TARGET gtest APPEND PROPERTY INCLUDE_DIRECTORIES /usr/src/gtest) + target_link_libraries (gtest ${CMAKE_THREAD_LIBS_INIT}) + + enable_testing () commit 3326b7ecc08948d1ca05c8e4b6e82d41aeccd695 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 11:14:02 2015 +1100 Refresh use-system-libbacktrace diff --git a/debian/patches/use-system-libbacktrace b/debian/patches/use-system-libbacktrace index 291fc40..bf54536 100644 --- a/debian/patches/use-system-libbacktrace +++ b/debian/patches/use-system-libbacktrace @@ -1,11 +1,11 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -428,8 +428,6 @@ +@@ -448,8 +448,6 @@ endif () if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") - add_subdirectory (thirdparty/libbacktrace) - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libbacktrace) - set (LIBBACKTRACE_LIBRARIES dl backtrace) + set (LIBBACKTRACE_LIBRARIES ${CMAKE_DL_LIBS} backtrace) add_definitions (-DHAVE_BACKTRACE=1) endif () commit b88bfdb1574e068269f74a7a6d27e14f237fec25 Author: Christopher James Halse Rogers <[email protected]> Date: Mon Oct 26 11:13:35 2015 +1100 Refresh use-system-snappy.patch diff --git a/debian/patches/use-system-snappy.patch b/debian/patches/use-system-snappy.patch index 6b0cda9..5d98b57 100644 --- a/debian/patches/use-system-snappy.patch +++ b/debian/patches/use-system-snappy.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -383,11 +383,18 @@ +@@ -403,11 +403,18 @@ find_package (SNAPPY) endif () if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND) @@ -31,26 +31,17 @@ +include_directories (${SNAPPY_STATIC_INCLUDE_DIRS}) + if (ENABLE_STATIC_LIBGCC) - add_linker_flags (-static-libgcc -Wl,--exclude-libs,libgcc.a) + add_linker_flags (-static-libgcc) endif () -@@ -337,7 +339,7 @@ - glhelpers - glproc_gl - common -- ${SNAPPY_LIBRARIES} -+ ${SNAPPY_STATIC_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - dl - ) -@@ -398,7 +400,7 @@ - glhelpers - glproc_egl - common -- ${SNAPPY_LIBRARIES} -+ ${SNAPPY_STATIC_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - dl - ) +@@ -62,7 +64,7 @@ + ) + target_link_libraries (trace + common +- ${SNAPPY_LIBRARIES} ++ ${SNAPPY_STATIC_LIBRARIES} + ) + + if (WIN32) --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -14,6 +14,8 @@ @@ -64,7 +55,7 @@ cli_diff.cpp --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt -@@ -63,6 +63,7 @@ +@@ -82,6 +82,7 @@ #add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png) include_directories( ${CMAKE_SOURCE_DIR} # for image/*
