[gtk+/wip/alexl/versioned-types-gtk2] wip hacks to handle version symbols
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/alexl/versioned-types-gtk2] wip hacks to handle version symbols
- Date: Fri, 29 Jan 2016 17:38:36 +0000 (UTC)
commit 182e25c073c4ca125084722040746bd100d1429c
Author: Alexander Larsson <alexl redhat com>
Date: Fri Jan 29 18:37:50 2016 +0100
wip hacks to handle version symbols
configure.ac | 6 +++++-
gdk/Makefile.am | 1 +
gtk/Makefile.am | 1 +
gtk/gtkmain.c | 2 ++
4 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7ed414c..dd15f82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,8 @@ PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
if test "$os_win32" != yes; then
# libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported
- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
+ LIBTOOL_EXPORT_OPTIONS=
+ #'-export-symbols-regex "^[[^_]].*"'
else
# We currently use .def files on Windows (for gdk and gtk)
LIBTOOL_EXPORT_OPTIONS=
@@ -1591,6 +1592,9 @@ fi
GOBJECT_INTROSPECTION_CHECK([0.9.3])
+GTK_VERSION_FLAGS="-Wl,--version-script=\$(top_srcdir)/gtk2.versions"
+AC_SUBST(GTK_VERSION_FLAGS)
+
##################################################
# Checks for gtk-doc and docbook-tools
##################################################
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 4d606e0..f70be0d 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -52,6 +52,7 @@ endif
# we use the general approach here
LDADD = \
$(GTK_LINK_FLAGS) \
+ $(GTK_VERSION_FLAGS) \
-version-info $(LT_VERSION_INFO) \
-export-dynamic \
-rpath $(libdir) \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9315919..cf3a4f4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -132,6 +132,7 @@ deps =
# we use the general approach here
libtool_opts = \
-version-info $(LT_VERSION_INFO) \
+ $(GTK_VERSION_FLAGS) \
-export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \
-rpath $(libdir) $(libgtk_target_ldflags)
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4fb791d..60594f3 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -639,6 +639,8 @@ _gtk_module_has_mixed_deps (GModule *module_to_check)
gpointer func;
gboolean result;
+ return FALSE;
+
if (!module_to_check)
module = g_module_open (NULL, 0);
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]