summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-04 11:47:35 -0800
committerChase Douglas <chase.douglas@canonical.com>2012-02-06 14:34:57 -0800
commit1f4bd9c267e70cf9ac8a57f90bf1795b0fa63d6c (patch)
treeeb6764036ee1c926933c989e3f8ea24d0b9b32fa
parent4216fddec31fed8b141f6d6f233c31e73e651fde (diff)
Add symbol version scripts
It would be nice to explicitly list each class method, but there's no documentation on how to do it, and everything I try fails. At least this ensures we don't ship visible symbols that are really part of GTest. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Stephen Webb <stephen.webb@canonical.com>
-rw-r--r--src/Makefile.am8
-rw-r--r--src/libxorg-gtest.ver15
-rw-r--r--src/libxorg-gtest_main.ver7
3 files changed, 28 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1daeeb8..579ed9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,11 @@ libxorg_gtest_main_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(GTEST_CPPFLAGS)
-libxorg_gtest_la_LDFLAGS = $(X11_LIBS)
-libxorg_gtest_main_la_LDFLAGS = $(X11_LIBS)
+libxorg_gtest_la_LDFLAGS = $(X11_LIBS) -Wl,--version-script=libxorg-gtest.ver
+libxorg_gtest_main_la_LDFLAGS = \
+ $(X11_LIBS) \
+ -Wl,--version-script=libxorg-gtest_main.ver
AM_CXXFLAGS = -I$(top_srcdir)/include
+
+EXTRA_DIST = libxorg-gtest.ver libxorg-gtest_main.ver
diff --git a/src/libxorg-gtest.ver b/src/libxorg-gtest.ver
new file mode 100644
index 0000000..e66c83a
--- /dev/null
+++ b/src/libxorg-gtest.ver
@@ -0,0 +1,15 @@
+XORG_GTEST_1.0 {
+ global:
+ extern "C++" {
+ xorg::testing::*;
+ "typeinfo for xorg::testing::Environment";
+ "typeinfo for xorg::testing::Test";
+ "typeinfo name for xorg::testing::Environment";
+ "typeinfo name for xorg::testing::Test";
+ "vtable for xorg::testing::Environment";
+ "vtable for xorg::testing::Test";
+ };
+
+ local:
+ *;
+};
diff --git a/src/libxorg-gtest_main.ver b/src/libxorg-gtest_main.ver
new file mode 100644
index 0000000..001ce91
--- /dev/null
+++ b/src/libxorg-gtest_main.ver
@@ -0,0 +1,7 @@
+XORG_GTEST_1.0 {
+ global:
+ main;
+
+ local:
+ *;
+};