wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-30 20:37:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2023-11-10 15:33:35 +08:00
commit dd337fad41
4 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/rules.mk
View file

@ -411,6 +411,10 @@ EXTRA_DSO_LDOPTS += -Wl,--version-script,$(SYMBOLS_FILE)
else else
ifeq ($(OS_TARGET),Darwin) ifeq ($(OS_TARGET),Darwin)
EXTRA_DSO_LDOPTS += -Wl,-exported_symbols_list,$(SYMBOLS_FILE) EXTRA_DSO_LDOPTS += -Wl,-exported_symbols_list,$(SYMBOLS_FILE)
else
ifeq ($(OS_TARGET),SunOS)
EXTRA_DSO_LDOPTS += -Wl,-M,$(SYMBOLS_FILE)
endif
endif endif
endif endif
endif endif

1
dom/base/EventSource.cpp
View file

@ -190,6 +190,7 @@ public:
bool IsClosed() bool IsClosed()
{ {
MutexAutoLock lock(mMutex);
return ReadyState() == CLOSED; return ReadyState() == CLOSED;
} }

9
old-configure.in
View file

@ -5579,7 +5579,14 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
# --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
# and $NSPR_LIBS. # and $NSPR_LIBS.
ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`" case "${OS_TARGET}" in
Darwin|DragonFly|FreeBSD|NetBSD|OpenBSD)
ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`"
;;
*)
ac_configure_args="`echo $ac_configure_args | ${TOOLCHAIN_PREFIX}sed -e 's/--with-system-nspr\S* *//'`"
;;
esac
if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"

14
python/mozbuild/mozbuild/action/generate_symbols_file.py
View file

@ -83,6 +83,20 @@ def generate_symbols_file(output, *args):
# }; # };
output.write('{\nglobal:\n %s;\nlocal:\n *;\n};' output.write('{\nglobal:\n %s;\nlocal:\n *;\n};'
% ';\n '.join(symbols)) % ';\n '.join(symbols))
elif buildconfig.substs['OS_TARGET'] == 'SunOS':
# A linker version script is generated for Sun LD that looks like the
# following:
# $mapfile_version 2
# SYMBOL_VERSION SUNW_1.1 {
# global:
# symbol1;
# symbol2;
# ...
# local:
# *;
# };
output.write('$mapfile_version 2\nSYMBOL_VERSION SUNW_1.1 {\nglobal:\n %s;\nlocal:\n *;\n};'
% ';\n '.join(symbols))
elif buildconfig.substs['OS_TARGET'] == 'Darwin': elif buildconfig.substs['OS_TARGET'] == 'Darwin':
# A list of symbols is generated for Apple ld that simply lists all # A list of symbols is generated for Apple ld that simply lists all
# symbols, with an underscore prefix. # symbols, with an underscore prefix.