Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: 72868de81ebbdee892570a6748dd747706a6eacb
https://github.com/mailru/tarantool/commit/72868de81ebbdee892570a6748dd747706a6eacb
Author: Dmitry E. Oboukhov <[email protected]>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M debian/changelog
A debian/patches/libev-link-to-rt
A debian/patches/series
M src/CMakeLists.txt
Log Message:
-----------
librt in linklist for Debian/kFreeBSD
Signed-off-by: Konstantin Osipov <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 222378a..dd2bc30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tarantool (1.4.5+20120503-2) unstable; urgency=low
+
+ * Add librt to linklist (fix FTBFS with Debian/kFreeBSD).
+
+ -- Dmitry E. Oboukhov <[email protected]> Fri, 04 May 2012 09:27:04 +0400
+
tarantool (1.4.5+20120503-1) unstable; urgency=low
* New upstream snapshot.
diff --git a/debian/patches/libev-link-to-rt b/debian/patches/libev-link-to-rt
new file mode 100644
index 0000000..fb07155
--- /dev/null
+++ b/debian/patches/libev-link-to-rt
@@ -0,0 +1,11 @@
+--- tarantool-1.4.5+20120503.orig/src/CMakeLists.txt
++++ tarantool-1.4.5+20120503/src/CMakeLists.txt
+@@ -32,7 +32,7 @@ endif()
+ #
+ # libev uses ceil and floor from the standard math library
+ #
+-target_link_libraries(ev m)
++target_link_libraries(ev m rt)
+
+ #
+ # Build admin.m from admin.rl, but only if admin.rl was changed.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ad96ef6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libev-link-to-rt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d8864cd..baed8f5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
#
# libev uses ceil and floor from the standard math library
#
-target_link_libraries(ev m)
+target_link_libraries(ev m rt)
#
# Build admin.m from admin.rl, but only if admin.rl was changed.
================================================================
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
