|
18196
|
1 |
--- mozilla/js/ctypes/Makefile.in.old 2010-05-28 22:48:37.979725703 +0800
|
|
|
2 |
+++ mozilla/js/ctypes/Makefile.in 2010-05-28 22:49:28.989493230 +0800
|
|
|
3 |
@@ -96,7 +96,7 @@
|
|
|
4 |
|
|
|
5 |
# build libffi proper
|
|
|
6 |
LOCAL_INCLUDES = \
|
|
|
7 |
- -Ilibffi/include \
|
|
|
8 |
+ `pkg-config --cflags libffi` \
|
|
|
9 |
$(NULL)
|
|
|
10 |
|
|
|
11 |
ifeq ($(OS_ARCH),OS2)
|
|
|
12 |
@@ -104,9 +104,7 @@
|
|
|
13 |
emxomf $<
|
|
|
14 |
endif
|
|
|
15 |
|
|
|
16 |
-SHARED_LIBRARY_LIBS = \
|
|
|
17 |
- libffi/.libs/$(LIB_PREFIX)ffi.$(LIB_SUFFIX) \
|
|
|
18 |
- $(NULL)
|
|
|
19 |
+OS_LIBS += `pkg-config --libs libffi`
|
|
|
20 |
|
|
|
21 |
endif # _MSVC_VER
|
|
|
22 |
|
|
|
23 |
--- mozilla/configure.old 2010-05-28 22:46:59.926484237 +0800
|
|
|
24 |
+++ mozilla/configure 2010-05-28 22:48:18.660240139 +0800
|
|
|
25 |
@@ -24063,6 +24063,8 @@
|
|
|
26 |
ac_configure_args="$ac_configure_args --build=$build --host=$target"
|
|
|
27 |
fi
|
|
|
28 |
if test "$SOLARIS_SUNPRO_CC"; then
|
|
|
29 |
+ # Build against system libffi
|
|
|
30 |
+ if 0; then
|
|
|
31 |
# Always use gcc for libffi on Solaris
|
|
|
32 |
old_cache_file=$cache_file
|
|
|
33 |
cache_file=js/ctypes/libffi/config.cache
|
|
|
34 |
@@ -24166,6 +24168,7 @@
|
|
|
35 |
fi
|
|
|
36 |
|
|
|
37 |
cache_file=$old_cache_file
|
|
|
38 |
+fi
|
|
|
39 |
else
|
|
|
40 |
|
|
|
41 |
if test "$no_recursion" != yes; then
|