]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph needs gmock/gtest to be statically linked 3888/head
authorLoic Dachary <ldachary@redhat.com>
Thu, 5 Mar 2015 23:06:21 +0000 (00:06 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 5 Mar 2015 23:23:44 +0000 (00:23 +0100)
The ceph-test package depends on gmock and gtest and needs to statically
link them because packages are not configured to distribute the
corresponding shared library files.

Update the gmock submodule to the version that is configured with
noinst libraries that will be statically linked.

The gmock submodule is modified to reference the branch in which the
ceph specific changes have been done.

http://tracker.ceph.com/issues/11040 Fixes: #11040

Signed-off-by: Loic Dachary <loic@dachary.org>
.gitmodules
src/gmock

index bcbaeab10b713e0079253d3b7fd1144168a35881..df66266bf80817b2fb6fa8b8165b5587b06fa509 100644 (file)
@@ -25,3 +25,4 @@
 [submodule "src/gmock"]
        path = src/gmock
        url = https://github.com/ceph/gmock.git
+        branch = ceph-release-1.7.0
index e4f3100fc3c0544b8504ac8237b777bf102b5755..d701f9d547a03677d612d7af3f212871a427f058 160000 (submodule)
--- a/src/gmock
+++ b/src/gmock
@@ -1 +1 @@
-Subproject commit e4f3100fc3c0544b8504ac8237b777bf102b5755
+Subproject commit d701f9d547a03677d612d7af3f212871a427f058