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