Actions
Bug #11040
closedgmock / gtest must be convenience libraries
% Done:
100%
Source:
other
Tags:
Backport:
Regression:
Severity:
3 - minor
Reviewed:
Affected Versions:
ceph-qa-suite:
Pull request ID:
Crash signature (v1):
Crash signature (v2):
Description
Because the packages do not distribute the gtest / gmock shared library files. When the gmock / gtest directories were converted into modules, the following diff went missing:
diff -ru src/gmock/gtest/Makefile.am ../ceph/src/gmock/gtest/Makefile.am --- src/gmock/gtest/Makefile.am 2015-03-05 13:58:57.959272641 +0100 +++ ../ceph/src/gmock/gtest/Makefile.am 2015-03-05 21:22:55.904956544 +0100 @@ -169,7 +169,7 @@ # We define the global AM_CPPFLAGS as everything we compile includes from these # directories. -AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include -DGTEST_HAS_TR1_TUPLE=0 +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include # Modifies compiler and linker flags for pthreads compatibility. if HAVE_PTHREADS @@ -180,7 +180,7 @@ endif # Build rules for libraries. -noinst_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la +lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la lib_libgtest_la_SOURCES = src/gtest-all.cc @@ -219,7 +219,7 @@ # TESTS -- Programs run automatically by "make check" # check_PROGRAMS -- Programs built by "make check" but not necessarily run -noinst_LTLIBRARIES += samples/libsamples.la +noinst_LTLIBRARIES = samples/libsamples.la samples_libsamples_la_SOURCES = \ samples/sample1.cc \ diff -ru src/gmock/Makefile.am ../ceph/src/gmock/Makefile.am --- src/gmock/Makefile.am 2015-03-05 13:58:57.951272744 +0100 +++ ../ceph/src/gmock/Makefile.am 2015-03-05 21:22:55.856956857 +0100 @@ -21,7 +21,7 @@ endif # Build rules for libraries. -noinst_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la +lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la lib_libgmock_la_SOURCES = src/gmock-all.cc
Updated by Loïc Dachary about 9 years ago
Updated by Loïc Dachary about 9 years ago
- Status changed from In Progress to Fix Under Review
- % Done changed from 0 to 80
Updated by Loïc Dachary about 9 years ago
- Status changed from Fix Under Review to Resolved
- % Done changed from 80 to 100
Actions