mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1090107 - Define stlport dependencies in moz.build. r=mshal
This commit is contained in:
Mike Hommey
parent
4d2262d02a
commit
9b1a605c36
@ -240,7 +240,6 @@ if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
|
||||
fi
|
||||
else
|
||||
STLPORT_CPPFLAGS="-isystem $_topsrcdir/build/stlport/stlport -isystem $_topsrcdir/build/stlport/overrides -isystem $android_ndk/sources/cxx-stl/system/include"
|
||||
STLPORT_LIBS="$_objdir/build/stlport/libstlport_static.a -static-libstdc++"
|
||||
fi
|
||||
fi
|
||||
CXXFLAGS="$CXXFLAGS $STLPORT_CPPFLAGS"
|
||||
|
||||
@ -4,7 +4,13 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
Library('stlport_static')
|
||||
Library('stlport')
|
||||
# Keep the same name as the NDK-provided library, while using a shorter
|
||||
# name for the Library for convenience in moz.build.
|
||||
STATIC_LIBRARY_NAME = 'stlport_static'
|
||||
|
||||
if not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
OS_LIBS += ['-static-libstdc++']
|
||||
|
||||
FORCE_STATIC_LIB = True
|
||||
|
||||
|
||||
@ -5,19 +5,31 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
@template
|
||||
def StdCppCompat():
|
||||
'''Template for libstdc++ compatibility for target binaries.'''
|
||||
def Binary():
|
||||
'''Generic template for target binaries. Meant to be used by other
|
||||
templates.'''
|
||||
|
||||
if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']:
|
||||
USE_LIBS += ['stdc++compat']
|
||||
|
||||
# Ideally, we'd support not adding this to the LIB_IS_C_ONLY case,
|
||||
# but that variable is actually only set in db/sqlite/src, which
|
||||
# doesn't build a shared library on the relevant platforms anyways.
|
||||
# Eventually, though, we should detect LIB_IS_C_ONLY based on the
|
||||
# associated SOURCES (and there might actually be places where we
|
||||
# haven't set it but should have).
|
||||
if CONFIG['STLPORT_LIBS']:
|
||||
OS_LIBS += [CONFIG['STLPORT_LIBS']]
|
||||
elif CONFIG['OS_TARGET'] == 'Android':
|
||||
USE_LIBS += ['stlport']
|
||||
|
||||
|
||||
@template
|
||||
def Program(name):
|
||||
'''Template for program executables.'''
|
||||
PROGRAM = name
|
||||
|
||||
StdCppCompat()
|
||||
Binary()
|
||||
|
||||
|
||||
@template
|
||||
@ -29,7 +41,7 @@ def SimplePrograms(names, ext='.cpp'):
|
||||
SIMPLE_PROGRAMS += names
|
||||
SOURCES += ['%s%s' % (name, ext) for name in names]
|
||||
|
||||
StdCppCompat()
|
||||
Binary()
|
||||
|
||||
|
||||
@template
|
||||
@ -41,7 +53,7 @@ def CppUnitTests(names, ext='.cpp'):
|
||||
CPP_UNIT_TESTS += names
|
||||
SOURCES += ['%s%s' % (name, ext) for name in names]
|
||||
|
||||
StdCppCompat()
|
||||
Binary()
|
||||
|
||||
|
||||
@template
|
||||
@ -57,7 +69,7 @@ def SharedLibrary(name):
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
StdCppCompat()
|
||||
Binary()
|
||||
|
||||
|
||||
@template
|
||||
|
||||
@ -696,7 +696,7 @@ ifdef MOZ_PROFILE_GENERATE
|
||||
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
|
||||
endif
|
||||
else # !WINNT || GNU_CC
|
||||
$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS)
|
||||
$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
||||
$(call CHECK_BINARY,$@)
|
||||
endif # WINNT && !GNU_CC
|
||||
|
||||
@ -752,7 +752,7 @@ ifdef MSMANIFEST_TOOL
|
||||
fi
|
||||
endif # MSVC with manifest tool
|
||||
else
|
||||
$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(STLPORT_LIBS)
|
||||
$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS)
|
||||
$(call CHECK_BINARY,$@)
|
||||
endif # WINNT && !GNU_CC
|
||||
|
||||
@ -834,10 +834,10 @@ ifdef DTRACE_LIB_DEPENDENT
|
||||
ifndef XP_MACOSX
|
||||
dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
|
||||
endif
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE)
|
||||
@$(RM) $(DTRACE_PROBE_OBJ)
|
||||
else # ! DTRACE_LIB_DEPENDENT
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE)
|
||||
endif # DTRACE_LIB_DEPENDENT
|
||||
$(call CHECK_BINARY,$@)
|
||||
|
||||
|
||||
@ -229,7 +229,6 @@ if test -n "$gonkdir" ; then
|
||||
AC_MSG_ERROR([Couldn't find path to stlport sources in the gonk tree])
|
||||
fi
|
||||
STLPORT_CPPFLAGS="-I$_topsrcdir/build/stlport/stlport -I$gonkdir/ndk/sources/cxx-stl/system/include"
|
||||
STLPORT_LIBS="$_objdir/build/stlport/libstlport_static.a"
|
||||
|
||||
case "$target_cpu" in
|
||||
arm)
|
||||
@ -9060,8 +9059,6 @@ HAVE_SYS_VFS_H
|
||||
HAVE_SYS_MOUNT_H
|
||||
"
|
||||
|
||||
AC_SUBST(STLPORT_LIBS)
|
||||
|
||||
dnl ========================================================
|
||||
dnl ICU Support
|
||||
dnl ========================================================
|
||||
|
||||
@ -1166,13 +1166,6 @@ INSTALL_TARGETS += %(prefix)s
|
||||
if obj.config.substs.get('MOZ_MEMORY'):
|
||||
self._compile_graph[build_target].add('memory/build/target')
|
||||
|
||||
# Until STLPORT_LIBS are properly handled in moz.build world, assume
|
||||
# any program or shared library we build depends on it.
|
||||
if obj.KIND == 'target' and not isinstance(obj, StaticLibrary) and \
|
||||
build_target != 'build/stlport/target' and \
|
||||
'stlport' in obj.config.substs.get('STLPORT_LIBS'):
|
||||
self._compile_graph[build_target].add('build/stlport/target')
|
||||
|
||||
for lib in obj.linked_libraries:
|
||||
if not isinstance(lib, ExternalLibrary):
|
||||
self._compile_graph[build_target].add(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user