wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout Bug 648134 due to bustage. (rather than back out the whole push)

Browse Source
This commit is contained in:
Justin Wood 2011-08-10 05:18:24 -04:00
parent a1c8316d83
commit 19e1a18275
7 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/expandlibs_exec.py
View File

@ -115,7 +115,6 @@ class ExpandArgsMore(ExpandArgs):
content = ["%s\n" % obj for obj in objs]
ref = "@" + tmp
else:
os.close(fd)
os.remove(tmp)
return
self.tmp.append(tmp)

2
config/rules.mk
View File

@ -1096,7 +1096,7 @@ $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
endif
ifeq ($(OS_ARCH),OS2)
$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS_DEPS)
$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
$(RM) $@
echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@
echo PROTMODE >> $@

5
configure.in
View File

@ -2520,7 +2520,6 @@ ia64*-hpux*)
DSO_PIC_CFLAGS=
AR=emxomfar
AR_FLAGS='r $@'
AR_EXTRACT=
CFLAGS="$CFLAGS -Zomf"
CXXFLAGS="$CXXFLAGS -Zomf"
DSO_LDOPTS='-Zdll'
@ -8127,11 +8126,11 @@ AC_CACHE_CHECK(what kind of list files are supported by the linker,
[echo "int main() {return 0;}" > conftest.${ac_ext}
if AC_TRY_COMMAND(${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&2) && test -s conftest.${OBJ_SUFFIX}; then
echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $LDFLAGS conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=linkerscript
else
echo "conftest.${OBJ_SUFFIX}" > conftest.list
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $LDFLAGS @conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=list
else
EXPAND_LIBS_LIST_STYLE=none

7
js/src/Makefile.in
View File

@ -503,13 +503,8 @@ ifdef MOZ_NATIVE_FFI
EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS)
else
ifeq ($(OS_ARCH),OS2)
libs:: ctypes/libffi/.libs/ffi.$(LIB_SUFFIX)
ctypes/libffi/.libs/ffi.$(LIB_SUFFIX): ctypes/libffi/.libs/$(LIB_PREFIX)ffi.a
emxomf $<
SHARED_LIBRARY_LIBS += \
ctypes/libffi/.libs/ffi.$(LIB_SUFFIX) \
ctypes/libffi/.libs/ffi.a \
$(NULL)
else
SHARED_LIBRARY_LIBS += \

1
js/src/config/expandlibs_exec.py
View File

@ -115,7 +115,6 @@ class ExpandArgsMore(ExpandArgs):
content = ["%s\n" % obj for obj in objs]
ref = "@" + tmp
else:
os.close(fd)
os.remove(tmp)
return
self.tmp.append(tmp)

2
js/src/config/rules.mk
View File

@ -1096,7 +1096,7 @@ $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
endif
ifeq ($(OS_ARCH),OS2)
$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS_DEPS)
$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
$(RM) $@
echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@
echo PROTMODE >> $@

7
js/src/configure.in
View File

@ -2437,7 +2437,6 @@ ia64*-hpux*)
DSO_PIC_CFLAGS=
AR=emxomfar
AR_FLAGS='r $@'
AR_EXTRACT=
CFLAGS="$CFLAGS -Zomf"
CXXFLAGS="$CXXFLAGS -Zomf"
DSO_LDOPTS='-Zdll'
@ -5369,11 +5368,11 @@ AC_CACHE_CHECK(what kind of list files are supported by the linker,
[echo "int main() {return 0;}" > conftest.${ac_ext}
if AC_TRY_COMMAND(${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&2) && test -s conftest.${OBJ_SUFFIX}; then
echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $LDFLAGS conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=linkerscript
else
echo "conftest.${OBJ_SUFFIX}" > conftest.list
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $LDFLAGS @conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&2) && test -s conftest${ac_exeext}; then
EXPAND_LIBS_LIST_STYLE=list
else
EXPAND_LIBS_LIST_STYLE=none
@ -5981,7 +5980,7 @@ if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then
fi
fi
if test "$OS_ARCH" = "OS2"; then
ac_configure_args="$ac_configure_args AR=ar"
ac_configure_args="$ac_configure_args CFLAGS=-Zomf AR=emxomfar"
fi
# Use a separate cache file for libffi, since it does things differently