luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: link against gthread and gmodule

Browse Source 
When cross-compiling with linaro toolchain 4.6.2, I got several
linking errors about missing symbols because a couple libraries are
not linked.

This patch adds to the LDADD flags the missed libraries.

This patch applies above the glib-2-30 branch.

Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>

https://bugzilla.gnome.org/show_bug.cgi?id=671711
This commit is contained in:
Víctor Manuel Jáquez Leal 2012-03-09 12:45:41 +01:00 committed by Matthias Clasen
parent b299d20923
commit 02f5d4e13e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/Makefile.am
View File

@ -48,6 +48,12 @@ AM_CPPFLAGS = \
lib_LTLIBRARIES = libgio-2.0.la lib_LTLIBRARIES = libgio-2.0.la
gio_dependency_libs = \
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
$(top_builddir)/gthread/libgthread-2.0.la
gdbus_headers = \ gdbus_headers = \
gdbusauthobserver.h \ gdbusauthobserver.h \
gcredentials.h \ gcredentials.h \
@ -602,10 +608,8 @@ bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings
gio_querymodules_SOURCES = gio-querymodules.c gio_querymodules_SOURCES = gio-querymodules.c
gio_querymodules_LDADD = \ gio_querymodules_LDADD = \
$(top_builddir)/glib/libglib-2.0.la \ $(gio_dependency_libs) \
$(top_builddir)/gobject/libgobject-2.0.la \ libgio-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
libgio-2.0.la \
$(NULL) $(NULL)
glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
@ -616,8 +620,7 @@ glib_compile_schemas_SOURCES = \
glib-compile-schemas.c glib-compile-schemas.c
gsettings_LDADD = \ gsettings_LDADD = \
$(top_builddir)/glib/libglib-2.0.la \ $(gio_dependency_libs) \
$(top_builddir)/gobject/libgobject-2.0.la \
libgio-2.0.la libgio-2.0.la
gsettings_SOURCES = gsettings-tool.c gsettings_SOURCES = gsettings-tool.c
@ -630,8 +633,7 @@ dist_schema_DATA = gschema.dtd
bin_PROGRAMS += gdbus bin_PROGRAMS += gdbus
gdbus_SOURCES = gdbus-tool.c gdbus_SOURCES = gdbus-tool.c
gdbus_LDADD = libgio-2.0.la \ gdbus_LDADD = libgio-2.0.la \
$(top_builddir)/glib/libglib-2.0.la \ $(gio_dependency_libs)
$(top_builddir)/gobject/libgobject-2.0.la
completiondir = $(sysconfdir)/bash_completion.d completiondir = $(sysconfdir)/bash_completion.d
completion_DATA = \ completion_DATA = \

1
gio/tests/Makefile.am
View File

@ -22,6 +22,7 @@ progs_ldadd = \
$(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gthread/libgthread-2.0.la \ $(top_builddir)/gthread/libgthread-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
$(top_builddir)/gio/libgio-2.0.la $(top_builddir)/gio/libgio-2.0.la
TEST_PROGS += \ TEST_PROGS += \

2
tests/Makefile.am
View File

@ -79,7 +79,7 @@ errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS)
assert_msg_test_LDADD = $(libglib) assert_msg_test_LDADD = $(libglib)
if ENABLE_TIMELOOP if ENABLE_TIMELOOP
timeloop_LDADD = $(libglib) timeloop_LDADD = $(libglib)
timeloop_closure_LDADD = $(libglib) $(libgobject) timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread)
endif endif
datetime_LDADD = $(libglib) datetime_LDADD = $(libglib)