|
17060
|
1 |
diff --git a/js/ctypes/Makefile.in b/js/ctypes/Makefile.in
|
|
|
2 |
--- a/js/ctypes/Makefile.in
|
|
|
3 |
+++ b/js/ctypes/Makefile.in
|
|
17285
|
4 |
@@ -96,7 +96,7 @@
|
|
17060
|
5 |
|
|
|
6 |
# build libffi proper
|
|
|
7 |
LOCAL_INCLUDES = \
|
|
|
8 |
- -Ilibffi/include \
|
|
|
9 |
+ `pkg-config --cflags libffi` \
|
|
|
10 |
$(NULL)
|
|
|
11 |
|
|
17285
|
12 |
ifeq ($(OS_ARCH),OS2)
|
|
|
13 |
@@ -104,9 +104,7 @@
|
|
|
14 |
emxomf $<
|
|
|
15 |
endif
|
|
|
16 |
|
|
17060
|
17 |
-SHARED_LIBRARY_LIBS = \
|
|
|
18 |
- libffi/.libs/$(LIB_PREFIX)ffi.$(LIB_SUFFIX) \
|
|
|
19 |
- $(NULL)
|
|
|
20 |
+OS_LIBS += `pkg-config --libs libffi`
|
|
|
21 |
|
|
|
22 |
endif # _MSVC_VER
|
|
|
23 |
|
|
|
24 |
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
|
|
|
25 |
--- a/toolkit/toolkit-tiers.mk
|
|
|
26 |
+++ b/toolkit/toolkit-tiers.mk
|
|
|
27 |
@@ -79,19 +79,19 @@ tier_external_dirs += gfx/qcms
|
|
|
28 |
tier_gecko_dirs += \
|
|
|
29 |
js/src/xpconnect \
|
|
|
30 |
js/ctypes \
|
|
|
31 |
intl/chardet \
|
|
|
32 |
$(NULL)
|
|
|
33 |
|
|
|
34 |
ifdef BUILD_CTYPES
|
|
|
35 |
ifndef _MSC_VER
|
|
|
36 |
-tier_gecko_staticdirs += \
|
|
|
37 |
- js/ctypes/libffi \
|
|
|
38 |
- $(NULL)
|
|
|
39 |
+#tier_gecko_staticdirs += \
|
|
|
40 |
+# js/ctypes/libffi \
|
|
|
41 |
+# $(NULL)
|
|
|
42 |
endif
|
|
|
43 |
endif
|
|
|
44 |
|
|
|
45 |
ifdef MOZ_ENABLE_GTK2
|
|
|
46 |
ifdef MOZ_X11
|
|
|
47 |
tier_gecko_dirs += widget/src/gtkxtbin
|
|
|
48 |
endif
|
|
|
49 |
endif
|
|
|
50 |
--- mozilla-1.9.2/toolkit/library/Makefile.in.orig 2009-11-25 17:07:11.556040322 +0800
|
|
|
51 |
+++ mozilla-1.9.2/toolkit/library/Makefile.in 2009-11-25 17:11:38.829395885 +0800
|
|
20045
|
52 |
@@ -254,7 +254,7 @@
|
|
17060
|
53 |
endif
|
|
|
54 |
|
|
|
55 |
ifeq ($(OS_ARCH),SunOS)
|
|
|
56 |
-EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg -lelf -ldemangle
|
|
|
57 |
+EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg -lelf -ldemangle `pkg-config --libs libffi`
|
|
|
58 |
endif
|
|
|
59 |
|
|
20045
|
60 |
ifeq ($(OS_ARCH),AIX)
|
|
17213
|
61 |
--- mozilla-1.9.2/configure.orig 2009-11-25 17:09:18.814435964 +0800
|
|
|
62 |
+++ mozilla-1.9.2/configure 2009-11-25 17:09:20.965798324 +0800
|
|
|
63 |
@@ -23862,6 +23861,8 @@
|
|
|
64 |
ac_configure_args="$ac_configure_args --build=$build --host=$target"
|
|
|
65 |
fi
|
|
|
66 |
if test "$SOLARIS_SUNPRO_CC"; then
|
|
|
67 |
+# Build against system libffi
|
|
|
68 |
+if 0; then
|
|
|
69 |
# Always use gcc for libffi on Solaris
|
|
|
70 |
old_cache_file=$cache_file
|
|
|
71 |
cache_file=js/ctypes/libffi/config.cache
|
|
|
72 |
@@ -23965,6 +23966,7 @@
|
|
|
73 |
fi
|
|
|
74 |
|
|
|
75 |
cache_file=$old_cache_file
|
|
|
76 |
+fi
|
|
|
77 |
else
|
|
|
78 |
|
|
|
79 |
if test "$no_recursion" != yes; then
|
|
20045
|
80 |
--- toolkit/library/Makefile.in.orig 2010-09-08 15:00:53.950150433 +0800
|
|
|
81 |
+++ toolkit/library/Makefile.in 2010-09-08 15:05:34.106202375 +0800
|