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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
|
This file is part of mingw-cross-env.
See doc/index.html for further information.
Contains ad hoc patches for cross building.
From ed3371ed8a13f169cfd1920ecc794b30bb69cc0b Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 00:52:59 +0200
Subject: [PATCH 1/5] s,DllMain,static _disabled_DllMain,
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 100dbc7..f60be42 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -657,12 +657,12 @@ pango_config_key_get (const char *key)
#ifdef G_OS_WIN32
-/* DllMain function needed to tuck away the DLL handle */
+/* static _disabled_DllMain function needed to tuck away the DLL handle */
static HMODULE pango_dll;
BOOL WINAPI
-DllMain (HINSTANCE hinstDLL,
+static _disabled_DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
--
1.7.1
From b33f70af495cdaddab9ddccd79aef777e005bb85 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 00:55:07 +0200
Subject: [PATCH 2/5] static, not shared
diff --git a/configure b/configure
index 352c9c4..a78ace5 100755
--- a/configure
+++ b/configure
@@ -5942,9 +5942,9 @@ if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
- no) enable_static=no ;;
+ no) enable_static=yes ;;
*)
- enable_static=no
+ enable_static=yes
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
for pkg in $enableval; do
@@ -5957,7 +5957,7 @@ if test "${enable_static+set}" = set; then :
;;
esac
else
- enable_static=no
+ enable_static=yes
fi
@@ -5971,15 +5971,15 @@ fi
if test "$pango_os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
- enable_static=no
+ { $as_echo "(disabled warning)" >&5
+$as_echo "(disabled warning)" >&2;}
+ enable_static=yes
fi
if test x$enable_shared = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
+ { $as_echo "(disabled warning)" >&5
+$as_echo "(disabled warning)" >&2;}
fi
- enable_shared=yes
+ enable_shared=no
fi
case `pwd` in
@@ -8969,7 +8969,7 @@ fi
if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
- yes) enable_shared=yes ;;
+ yes) enable_shared=no ;;
no) enable_shared=no ;;
*)
enable_shared=no
@@ -8978,14 +8978,14 @@ if test "${enable_shared+set}" = set; then :
for pkg in $enableval; do
IFS="$lt_save_ifs"
if test "X$pkg" = "X$p"; then
- enable_shared=yes
+ enable_shared=no
fi
done
IFS="$lt_save_ifs"
;;
esac
else
- enable_shared=yes
+ enable_shared=no
fi
@@ -12572,7 +12572,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test "$enable_shared" = yes && enable_static=yes
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -12581,7 +12581,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ test "$enable_shared" = yes && enable_static=yes
fi
;;
esac
--
1.7.1
From 4601f723ef49c010656ef800ce705cd8677833d4 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 00:57:12 +0200
Subject: [PATCH 3/5] no pango-querymodules
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 0d48e08..df71e02 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -643,7 +643,7 @@ uninstall-am: uninstall-local
@CROSS_COMPILING_FALSE@all-local: pango.modules
-install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
+install-data-local:
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
--
1.7.1
From 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 00:58:13 +0200
Subject: [PATCH 4/5] wine workaround s,^install-data-local:.*,install-data-local:,
diff --git a/configure b/configure
index a78ace5..92b1334 100755
--- a/configure
+++ b/configure
@@ -694,7 +694,7 @@ ac_default_prefix=/usr/local
ac_clean_files=
ac_config_libobj_dir=.
LIBOBJS=
-cross_compiling=no
+cross_compiling=yes
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -3873,7 +3873,7 @@ $as_echo "$ac_try_echo"; } >&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
- cross_compiling=no
+ cross_compiling=yes
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
--
1.7.1
From ccd472e0aee0109932e261eb1f7d9d24bbf1870c Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 00:50:08 +0200
Subject: [PATCH 5/5] add missing lib to pango.pc for static linking
diff --git a/pango.pc.in b/pango.pc.in
index 5cc3ef8..745b8f0 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -9,5 +9,5 @@ Name: Pango
Description: Internationalized text handling
Version: @VERSION@
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
+Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10
Cflags: -I${includedir}/pango-1.0
--
1.7.1
|
