blob: 3c14fd048c913d682b792730e55ac84e9bb5133c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
# gatomic.c uses SWP, which doesn't work in Thumb mode.
# Put that source file into a separate convenience library which is always built as ARM.
diff -uNr glib-2.23.6.orig//glib/Makefile.am glib-2.23.6/glib/Makefile.am
--- glib-2.23.6.orig//glib/Makefile.am 2010-03-21 19:05:08.000000000 +0100
+++ glib-2.23.6/glib/Makefile.am 2010-03-26 11:52:49.000000000 +0100
@@ -87,6 +87,7 @@
galiasdef.c
lib_LTLIBRARIES = libglib-2.0.la
+noinst_LTLIBRARIES = libgatomic.la
if OS_WIN32_AND_DLL_COMPILATION
if MS_LIB_AVAILABLE
@@ -103,10 +104,14 @@
uninstall-ms-lib:
$(uninstall_ms_lib_cmd)
+libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb
+
+libgatomic_la_SOURCES = \
+ ${gatomic_c}
+
libglib_2_0_la_SOURCES = \
garray.c \
gasyncqueue.c \
- $(gatomic_c) \
gbacktrace.c \
gbase64.c \
gbitlock.c \
@@ -315,8 +320,8 @@
pcre_inc =
endif
-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la
libglib_2_0_la_LDFLAGS = \
$(glib_win32_res_ldflag) \
|
