debmon/mydumper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump

Browse Source
This commit is contained in:
Mario Fetka 2019-08-09 13:49:00 +02:00
parent dff7bba429
commit 9f30cb98ea
4 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
mydumper (0.9.1-5) unstable; urgency=medium mydumper (0.9.5-1) unstable; urgency=medium
* add patch to FindMySQL cmake module to find libatomic when it's needed * add patch to FindMySQL cmake module to find libatomic when it's needed

24
debian/patches/0003-explicitly-link-libm.patch vendored
View File

@ -10,7 +10,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5da3828..0a6f7e7 100644 index 5da3828..0a6f7e7 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ find_package(MySQL) @@ -9,6 +9,7 @@
find_package(ZLIB) find_package(ZLIB)
find_package(GLIB2) find_package(GLIB2)
find_package(PCRE) find_package(PCRE)
@ -18,23 +18,17 @@ index 5da3828..0a6f7e7 100644
option(BUILD_DOCS "Build the documentation" ON) option(BUILD_DOCS "Build the documentation" ON)
@@ -29,17 +30,15 @@ MARK_AS_ADVANCED(CMAKE) @@ -37,11 +38,11 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
-
if (WITH_BINLOG)
add_executable(mydumper mydumper.c binlog.c server_detect.c g_unix_signal.c)
else (WITH_BINLOG) else (WITH_BINLOG)
add_executable(mydumper mydumper.c server_detect.c g_unix_signal.c) add_executable(mydumper mydumper.c server_detect.c g_unix_signal.c connection.c getPassword.c)
endif (WITH_BINLOG) endif (WITH_BINLOG)
-target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES}) -target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} stdc++)
- +target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} ${M_LIB} stdc++)
+target_link_libraries(mydumper ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} ${M_LIB})
add_executable(myloader myloader.c)
-target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES}) add_executable(myloader myloader.c connection.c getPassword.c)
+target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} ${M_LIB}) -target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} stdc++)
+target_link_libraries(myloader ${MYSQL_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${PCRE_PCRE_LIBRARY} ${ZLIB_LIBRARIES} ${M_LIB} stdc++)
INSTALL(TARGETS mydumper myloader INSTALL(TARGETS mydumper myloader
RUNTIME DESTINATION bin RUNTIME DESTINATION bin

21
debian/patches/0004-add-library-suffix-for-libatomic.patch vendored
View File

@ -1,21 +0,0 @@
From: Mateusz Kijowski <mateusz@kijowski.info>
Date: Tue, 17 Jan 2017 12:57:43 +0100
Subject: add library suffix for libatomic
---
cmake/modules/FindMySQL.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
index ef64646..23470a8 100644
--- a/cmake/modules/FindMySQL.cmake
+++ b/cmake/modules/FindMySQL.cmake
@@ -84,7 +84,7 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
)
set(TMP_MYSQL_LIBRARIES "")
-set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib)
+set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1)
foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
HINTS

1
debian/patches/series vendored
View File

@ -1,4 +1,3 @@
0001-manpage-whatis-description.patch 0001-manpage-whatis-description.patch
0002-dont-install-documentation-source.patch 0002-dont-install-documentation-source.patch
0003-explicitly-link-libm.patch 0003-explicitly-link-libm.patch
0004-add-library-suffix-for-libatomic.patch