mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-27 02:47:31 +09:00
Issue #1751 - Remove MacOS support from configure
This commit is contained in:
Moonchild
roytam1
parent
b8f2ada817
commit
407a983af1
10 changed files with 38 additions and 1935 deletions
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if ! git remote -v | grep origin | grep -q cctools-port; then
|
|
||||||
echo "must be in a cctools-port checkout"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir build-cctools
|
|
||||||
cd build-cctools
|
|
||||||
|
|
||||||
CFLAGS='-mcpu=generic -mtune=generic' MACOSX_DEPLOYMENT_TARGET=10.7 ../cctools/configure --target=x86_64-apple-darwin11
|
|
||||||
env MACOSX_DEPLOYMENT_TARGET=10.7 make -s -j4
|
|
||||||
|
|
||||||
if test ! -e ld64/src/ld/ld; then
|
|
||||||
echo "ld did not get built"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
gtar jcf cctools.tar.bz2 ld64/src/ld/ld --transform 's#ld64/src/ld#cctools/bin#'
|
|
||||||
|
|
||||||
cd ../
|
|
||||||
|
|
||||||
echo "build from $(git show --pretty=format:%H -s HEAD) complete!"
|
|
||||||
echo "upload the build-cctools/cctools.tar.bz2 file to tooltool"
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# 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/.
|
|
||||||
|
|
||||||
MOZ_AUTOMATION_L10N_CHECK=0
|
|
||||||
|
|
||||||
if [ "x$IS_NIGHTLY" = "xyes" ]; then
|
|
||||||
# Some nightlies (eg: Mulet) don't want these set.
|
|
||||||
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
|
|
||||||
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
|
|
||||||
fi
|
|
||||||
. "$topsrcdir/build/mozconfig.common"
|
|
||||||
|
|
||||||
# ld needs libLTO.so from llvm
|
|
||||||
mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib"
|
|
||||||
|
|
||||||
CROSS_CCTOOLS_PATH=$topsrcdir/cctools
|
|
||||||
CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk
|
|
||||||
CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
|
|
||||||
FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
|
|
||||||
|
|
||||||
export CC="$topsrcdir/clang/bin/clang $FLAGS"
|
|
||||||
export CXX="$topsrcdir/clang/bin/clang++ $FLAGS"
|
|
||||||
export CPP="$topsrcdir/clang/bin/clang $FLAGS -E"
|
|
||||||
export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
|
|
||||||
export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
|
|
||||||
export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10-
|
|
||||||
export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
|
|
||||||
export GENISOIMAGE=$topsrcdir/genisoimage/genisoimage
|
|
||||||
export DMG_TOOL=$topsrcdir/dmg/dmg
|
|
||||||
|
|
||||||
export HOST_CC="$topsrcdir/clang/bin/clang"
|
|
||||||
export HOST_CXX="$topsrcdir/clang/bin/clang++"
|
|
||||||
export HOST_CPP="$topsrcdir/clang/bin/clang -E"
|
|
||||||
export HOST_CFLAGS="-g"
|
|
||||||
export HOST_CXXFLAGS="-g"
|
|
||||||
export HOST_LDFLAGS="-g"
|
|
||||||
|
|
||||||
ac_add_options --target=x86_64-apple-darwin
|
|
||||||
ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
|
|
||||||
|
|
||||||
# Enable static analysis checks by default on OSX cross builds.
|
|
||||||
ac_add_options --enable-clang-plugin
|
|
||||||
|
|
||||||
. "$topsrcdir/build/mozconfig.cache"
|
|
||||||
|
|
||||||
export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# 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/.
|
|
||||||
|
|
||||||
if [ "x$IS_NIGHTLY" = "xyes" ]; then
|
|
||||||
# Some nightlies (eg: Mulet) don't want these set.
|
|
||||||
MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
|
|
||||||
MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
|
|
||||||
MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
|
|
||||||
fi
|
|
||||||
. "$topsrcdir/build/mozconfig.common"
|
|
||||||
|
|
||||||
if [ -d "$topsrcdir/clang" ]; then
|
|
||||||
# mozilla-central based build
|
|
||||||
export CC=$topsrcdir/clang/bin/clang
|
|
||||||
export CXX=$topsrcdir/clang/bin/clang++
|
|
||||||
export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
|
|
||||||
export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
|
|
||||||
# Use an updated linker.
|
|
||||||
ldflags="-B$topsrcdir/cctools/bin"
|
|
||||||
elif [ -d "$topsrcdir/../clang" ]; then
|
|
||||||
# comm-central based build
|
|
||||||
export CC=$topsrcdir/../clang/bin/clang
|
|
||||||
export CXX=$topsrcdir/../clang/bin/clang++
|
|
||||||
export LLVMCONFIG=$topsrcdir/../clang/bin/llvm-config
|
|
||||||
export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil
|
|
||||||
# Use an updated linker.
|
|
||||||
ldflags="-B$topsrcdir/../cctools/bin"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure the updated linker doesn't generate things our older build tools
|
|
||||||
# don't understand.
|
|
||||||
ldflags="$ldflags -Wl,-no_data_in_code_info"
|
|
||||||
export LDFLAGS="$ldflags"
|
|
||||||
|
|
||||||
# If not set use the system default clang
|
|
||||||
if [ -z "$CC" ]; then
|
|
||||||
export CC=clang
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If not set use the system default clang++
|
|
||||||
if [ -z "$CXX" ]; then
|
|
||||||
export CXX=clang++
|
|
||||||
fi
|
|
||||||
|
|
||||||
export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
if test `uname -s` = Linux; then
|
|
||||||
. $topsrcdir/build/macosx/cross-mozconfig.common
|
|
||||||
else
|
|
||||||
. $topsrcdir/build/macosx/local-mozconfig.common
|
|
||||||
fi
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* 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/. */
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
if (argc != 2)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
uid_t realuser = getuid();
|
|
||||||
char uidstring[20];
|
|
||||||
snprintf(uidstring, 19, "%i", realuser);
|
|
||||||
uidstring[19] = '\0';
|
|
||||||
|
|
||||||
return execl("/usr/sbin/chown",
|
|
||||||
"/usr/sbin/chown", "-R", "-h", uidstring, argv[1], (char*) 0);
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* 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/. */
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
if (argc != 2)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
return execl("/usr/sbin/chown",
|
|
||||||
"/usr/sbin/chown", "-R", "-h", "root:admin", argv[1], (char*) 0);
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# 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/.
|
|
||||||
|
|
||||||
# i386/x86-64 Universal Build mozconfig
|
|
||||||
|
|
||||||
# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
|
|
||||||
# to gcc's -arch parameter.
|
|
||||||
mk_add_options MOZ_BUILD_PROJECTS="x86_64 i386"
|
|
||||||
|
|
||||||
. $topsrcdir/build/macosx/universal/mozconfig.common
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# 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/.
|
|
||||||
|
|
||||||
mk_add_options MOZ_UNIFY_BDATE=1
|
|
||||||
|
|
||||||
DARWIN_VERSION=10
|
|
||||||
ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
|
|
||||||
ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
|
|
||||||
ac_add_app_options i386 --with-unify-dist=../x86_64/dist
|
|
||||||
ac_add_app_options x86_64 --with-unify-dist=../i386/dist
|
|
||||||
|
|
||||||
if ! test `uname -s` = Linux; then
|
|
||||||
# Cross-universal builds already do the equivalent of this by setting -isysroot directly
|
|
||||||
ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.7.sdk
|
|
||||||
fi
|
|
||||||
|
|
||||||
. $topsrcdir/build/macosx/mozconfig.common
|
|
||||||
|
|
||||||
# $MOZ_BUILD_APP is only defined when sourced by configure. That's not a
|
|
||||||
# problem, because the variables it affects only need to be set for
|
|
||||||
# configure.
|
|
||||||
if test -n "$MOZ_BUILD_APP" ; then
|
|
||||||
if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
|
|
||||||
TARGET_CPU=$MOZ_BUILD_APP
|
|
||||||
|
|
||||||
# $HOST_CXX is presently unused. $HOST_CC will only be used during a cross
|
|
||||||
# compile.
|
|
||||||
HOST_CC=$CC
|
|
||||||
HOST_CXX=$CXX
|
|
||||||
|
|
||||||
NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
|
|
||||||
|
|
||||||
# It's not strictly necessary to specify -arch during native builds, but it
|
|
||||||
# makes the merged about:buildconfig easier to follow, and it reduces
|
|
||||||
# conditionalized differences between builds.
|
|
||||||
CC="$CC -arch $TARGET_CPU"
|
|
||||||
CXX="$CXX -arch $TARGET_CPU"
|
|
||||||
|
|
||||||
# These must be set for cross builds, and don't hurt straight builds.
|
|
||||||
RANLIB="${TOOLCHAIN_PREFIX}ranlib"
|
|
||||||
AR="${TOOLCHAIN_PREFIX}ar"
|
|
||||||
AS=$CC
|
|
||||||
LD=ld
|
|
||||||
STRIP="${TOOLCHAIN_PREFIX}strip"
|
|
||||||
OTOOL="${TOOLCHAIN_PREFIX}otool"
|
|
||||||
|
|
||||||
# Each per-CPU build should be entirely oblivious to the fact that a
|
|
||||||
# universal binary will be produced. The exception is packager.mk, which
|
|
||||||
# needs to know to look for universal bits when building the .dmg.
|
|
||||||
UNIVERSAL_BINARY=1
|
|
||||||
|
|
||||||
export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP OTOOL
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
File diff suppressed because it is too large
Load diff
224
old-configure.in
224
old-configure.in
|
|
@ -96,12 +96,6 @@ case "$target" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "$target" in
|
|
||||||
*-apple-darwin*)
|
|
||||||
MOZ_IOS_SDK
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST(ANDROID_SOURCE)
|
AC_SUBST(ANDROID_SOURCE)
|
||||||
AC_SUBST(ANDROID_PACKAGE_NAME)
|
AC_SUBST(ANDROID_PACKAGE_NAME)
|
||||||
AC_SUBST(OBJCOPY)
|
AC_SUBST(OBJCOPY)
|
||||||
|
|
@ -738,11 +732,6 @@ case "$host" in
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-darwin*)
|
|
||||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
|
|
||||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-linux*|*-kfreebsd*-gnu|*-gnu*)
|
*-linux*|*-kfreebsd*-gnu|*-gnu*)
|
||||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
||||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
||||||
|
|
@ -779,76 +768,6 @@ dnl System overrides of the defaults for target
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
|
||||||
case "$target" in
|
case "$target" in
|
||||||
*-darwin*)
|
|
||||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
|
||||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
|
||||||
MOZ_OPTIMIZE_FLAGS="-O3"
|
|
||||||
CXXFLAGS="$CXXFLAGS -stdlib=libc++"
|
|
||||||
DLL_SUFFIX=".dylib"
|
|
||||||
DSO_LDOPTS=''
|
|
||||||
STRIP_FLAGS="$STRIP_FLAGS -x -S"
|
|
||||||
# Ensure that if we're targeting iOS an SDK was provided.
|
|
||||||
AC_CACHE_CHECK(for iOS target,
|
|
||||||
ac_cv_ios_target,
|
|
||||||
[AC_TRY_COMPILE([#include <TargetConditionals.h>
|
|
||||||
#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
|
|
||||||
#error not iOS
|
|
||||||
#endif],
|
|
||||||
[],
|
|
||||||
ac_cv_ios_target="yes",
|
|
||||||
ac_cv_ios_target="no")])
|
|
||||||
if test "$ac_cv_ios_target" = "yes" -a -z $MOZ_IOS; then
|
|
||||||
AC_MSG_ERROR([targeting iOS but not using an iOS SDK?])
|
|
||||||
fi
|
|
||||||
if test -n "$MOZ_IOS"; then
|
|
||||||
direct_nspr_config=1
|
|
||||||
else
|
|
||||||
# The ExceptionHandling framework is needed for Objective-C exception
|
|
||||||
# logging code in nsObjCExceptions.h. Currently we only use that in debug
|
|
||||||
# builds.
|
|
||||||
MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$lto_is_enabled" = "xyes"; then
|
|
||||||
echo "Skipping -dead_strip because lto is enabled."
|
|
||||||
dnl DTrace and -dead_strip don't interact well. See bug 403132.
|
|
||||||
dnl ===================================================================
|
|
||||||
elif test "x$enable_dtrace" = "xyes"; then
|
|
||||||
echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."
|
|
||||||
else
|
|
||||||
dnl check for the presence of the -dead_strip linker flag
|
|
||||||
AC_MSG_CHECKING([for -dead_strip option to ld])
|
|
||||||
_SAVE_LDFLAGS=$LDFLAGS
|
|
||||||
LDFLAGS="$LDFLAGS -Wl,-dead_strip"
|
|
||||||
AC_TRY_LINK(,[return 0;],_HAVE_DEAD_STRIP=1,_HAVE_DEAD_STRIP=)
|
|
||||||
if test -n "$_HAVE_DEAD_STRIP" ; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip"
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
fi
|
|
||||||
|
|
||||||
LDFLAGS=$_SAVE_LDFLAGS
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl With newer linkers we need to pass -allow_heap_execute because of
|
|
||||||
dnl Microsoft Silverlight (5.1.10411.0 at least).
|
|
||||||
AC_MSG_CHECKING([for -allow_heap_execute option to ld])
|
|
||||||
_SAVE_LDFLAGS=$LDFLAGS
|
|
||||||
LDFLAGS="$LDFLAGS -Wl,-allow_heap_execute"
|
|
||||||
AC_TRY_LINK(,[return 0;],_HAVE_ALLOW_HEAP_EXECUTE=1,
|
|
||||||
_HAVE_ALLOW_HEAP_EXECUTE=)
|
|
||||||
if test -n "$_HAVE_ALLOW_HEAP_EXECUTE" ; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
MOZ_ALLOW_HEAP_EXECUTE_FLAGS="-Wl,-allow_heap_execute"
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
fi
|
|
||||||
LDFLAGS=$_SAVE_LDFLAGS
|
|
||||||
|
|
||||||
MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*-*linux*)
|
*-*linux*)
|
||||||
if test "$GNU_CC" -o "$GNU_CXX"; then
|
if test "$GNU_CC" -o "$GNU_CXX"; then
|
||||||
MOZ_PGO_OPTIMIZE_FLAGS="-O3"
|
MOZ_PGO_OPTIMIZE_FLAGS="-O3"
|
||||||
|
|
@ -1209,9 +1128,6 @@ case "$target" in
|
||||||
*-linux*|*-kfreebsd*-gnu|*-gnu*)
|
*-linux*|*-kfreebsd*-gnu|*-gnu*)
|
||||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
|
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
|
||||||
;;
|
;;
|
||||||
*-darwin*)
|
|
||||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list'
|
|
||||||
;;
|
|
||||||
*-mingw*)
|
*-mingw*)
|
||||||
if test -n "$GNU_CC"; then
|
if test -n "$GNU_CC"; then
|
||||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
|
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
|
||||||
|
|
@ -1246,8 +1162,6 @@ MOZ_CXX11
|
||||||
AC_LANG_C
|
AC_LANG_C
|
||||||
|
|
||||||
case "${OS_TARGET}" in
|
case "${OS_TARGET}" in
|
||||||
Darwin)
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
STL_FLAGS="-I${DIST}/stl_wrappers"
|
STL_FLAGS="-I${DIST}/stl_wrappers"
|
||||||
WRAP_STL_INCLUDES=1
|
WRAP_STL_INCLUDES=1
|
||||||
|
|
@ -1329,15 +1243,7 @@ dnl Checks for libraries.
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
AC_CHECK_LIB(c_r, gethostbyname_r)
|
AC_CHECK_LIB(c_r, gethostbyname_r)
|
||||||
|
|
||||||
dnl We don't want to link with libdl even if it's present on OS X, since
|
|
||||||
dnl it's not used and not part of the default installation. OS/2 has dlfcn
|
|
||||||
dnl in libc.
|
|
||||||
dnl We don't want to link against libm or libpthread on Darwin since
|
|
||||||
dnl they both are just symlinks to libSystem and explicitly linking
|
|
||||||
dnl against libSystem causes issues when debugging (see bug 299601).
|
|
||||||
case $target in
|
case $target in
|
||||||
*-darwin*)
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
AC_SEARCH_LIBS(dlopen, dl,
|
AC_SEARCH_LIBS(dlopen, dl,
|
||||||
MOZ_CHECK_HEADER(dlfcn.h,
|
MOZ_CHECK_HEADER(dlfcn.h,
|
||||||
|
|
@ -1413,27 +1319,20 @@ AC_SUBST_LIST(XSS_LIBS)
|
||||||
|
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl = pthread support
|
dnl = pthread support
|
||||||
dnl = Start by checking whether the system support pthreads
|
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
case "$target_os" in
|
|
||||||
darwin*)
|
AC_CHECK_LIB(pthreads, pthread_create,
|
||||||
MOZ_USE_PTHREADS=1
|
MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
|
||||||
;;
|
AC_CHECK_LIB(pthread, pthread_create,
|
||||||
*)
|
MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
|
||||||
AC_CHECK_LIB(pthreads, pthread_create,
|
AC_CHECK_LIB(c_r, pthread_create,
|
||||||
MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
|
MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
|
||||||
AC_CHECK_LIB(pthread, pthread_create,
|
AC_CHECK_LIB(c, pthread_create,
|
||||||
MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
|
MOZ_USE_PTHREADS=1
|
||||||
AC_CHECK_LIB(c_r, pthread_create,
|
|
||||||
MOZ_USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
|
|
||||||
AC_CHECK_LIB(c, pthread_create,
|
|
||||||
MOZ_USE_PTHREADS=1
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
;;
|
)
|
||||||
esac
|
|
||||||
|
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl Check the command line for --with-pthreads
|
dnl Check the command line for --with-pthreads
|
||||||
|
|
@ -1533,35 +1432,27 @@ AC_FUNC_MEMCMP
|
||||||
AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize gmtime_r localtime_r arc4random arc4random_buf mallinfo gettid lchown setpriority strerror syscall)
|
AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize gmtime_r localtime_r arc4random arc4random_buf mallinfo gettid lchown setpriority strerror syscall)
|
||||||
|
|
||||||
dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
|
dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
|
||||||
dnl avoid this on Darwin, since depending on your system config, we may think
|
AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
|
||||||
dnl it exists but it really doesn't
|
ac_cv_clock_monotonic,
|
||||||
case "$OS_TARGET" in
|
[for libs in "" -lrt; do
|
||||||
Darwin)
|
_SAVE_LIBS="$LIBS"
|
||||||
;;
|
LIBS="$LIBS $libs"
|
||||||
*)
|
AC_TRY_LINK([#include <time.h>],
|
||||||
AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
|
[ struct timespec ts;
|
||||||
ac_cv_clock_monotonic,
|
clock_gettime(CLOCK_MONOTONIC, &ts); ],
|
||||||
[for libs in "" -lrt; do
|
ac_cv_clock_monotonic=$libs
|
||||||
_SAVE_LIBS="$LIBS"
|
LIBS="$_SAVE_LIBS"
|
||||||
LIBS="$LIBS $libs"
|
break,
|
||||||
AC_TRY_LINK([#include <time.h>],
|
ac_cv_clock_monotonic=no)
|
||||||
[ struct timespec ts;
|
LIBS="$_SAVE_LIBS"
|
||||||
clock_gettime(CLOCK_MONOTONIC, &ts); ],
|
done])
|
||||||
ac_cv_clock_monotonic=$libs
|
if test "$ac_cv_clock_monotonic" != "no"; then
|
||||||
LIBS="$_SAVE_LIBS"
|
HAVE_CLOCK_MONOTONIC=1
|
||||||
break,
|
REALTIME_LIBS=$ac_cv_clock_monotonic
|
||||||
ac_cv_clock_monotonic=no)
|
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
|
||||||
LIBS="$_SAVE_LIBS"
|
AC_SUBST(HAVE_CLOCK_MONOTONIC)
|
||||||
done])
|
AC_SUBST_LIST(REALTIME_LIBS)
|
||||||
if test "$ac_cv_clock_monotonic" != "no"; then
|
fi
|
||||||
HAVE_CLOCK_MONOTONIC=1
|
|
||||||
REALTIME_LIBS=$ac_cv_clock_monotonic
|
|
||||||
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
|
|
||||||
AC_SUBST(HAVE_CLOCK_MONOTONIC)
|
|
||||||
AC_SUBST_LIST(REALTIME_LIBS)
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_CACHE_CHECK(for pthread_cond_timedwait_monotonic_np,
|
AC_CACHE_CHECK(for pthread_cond_timedwait_monotonic_np,
|
||||||
ac_cv_pthread_cond_timedwait_monotonic_np,
|
ac_cv_pthread_cond_timedwait_monotonic_np,
|
||||||
|
|
@ -1633,11 +1524,6 @@ AC_LANG_CPLUSPLUS
|
||||||
|
|
||||||
ICONV_LIBS=
|
ICONV_LIBS=
|
||||||
|
|
||||||
case $target_os in
|
|
||||||
darwin*|mingw*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
|
|
||||||
AC_CHECK_LIB(c, iconv, [ICONV_LIBS=],
|
AC_CHECK_LIB(c, iconv, [ICONV_LIBS=],
|
||||||
AC_CHECK_LIB(iconv, iconv, [ICONV_LIBS="-liconv"],
|
AC_CHECK_LIB(iconv, iconv, [ICONV_LIBS="-liconv"],
|
||||||
AC_CHECK_LIB(iconv, libiconv, [ICONV_LIBS="-liconv"])))
|
AC_CHECK_LIB(iconv, libiconv, [ICONV_LIBS="-liconv"])))
|
||||||
|
|
@ -1685,9 +1571,6 @@ if test "$ac_cv_func_iconv" = "yes"; then
|
||||||
fi
|
fi
|
||||||
LIBS=$_SAVE_LIBS
|
LIBS=$_SAVE_LIBS
|
||||||
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_SUBST_LIST(ICONV_LIBS)
|
AC_SUBST_LIST(ICONV_LIBS)
|
||||||
|
|
||||||
AM_LANGINFO_CODESET
|
AM_LANGINFO_CODESET
|
||||||
|
|
@ -1970,7 +1853,7 @@ dnl ========================================================
|
||||||
MOZ_ARG_HEADER(External Packages)
|
MOZ_ARG_HEADER(External Packages)
|
||||||
|
|
||||||
case "$OS_TARGET" in
|
case "$OS_TARGET" in
|
||||||
WINNT|Darwin|Android)
|
WINNT)
|
||||||
MOZ_FOLD_LIBS=1
|
MOZ_FOLD_LIBS=1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
@ -2604,7 +2487,7 @@ dnl --enable-webrtc to override. Can disable for everything in
|
||||||
dnl the master list above.
|
dnl the master list above.
|
||||||
if test -n "$MOZ_WEBRTC"; then
|
if test -n "$MOZ_WEBRTC"; then
|
||||||
case "$target" in
|
case "$target" in
|
||||||
*-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
|
*-linux*|*-mingw*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
|
||||||
dnl Leave enabled
|
dnl Leave enabled
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
@ -2750,11 +2633,11 @@ dnl = Client drawing in titlebar
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
if test -n "$MOZ_CAN_DRAW_IN_TITLEBAR"; then
|
if test -n "$MOZ_CAN_DRAW_IN_TITLEBAR"; then
|
||||||
case "$OS_TARGET" in
|
case "$OS_TARGET" in
|
||||||
WINNT|Darwin)
|
WINNT)
|
||||||
AC_DEFINE(MOZ_CAN_DRAW_IN_TITLEBAR)
|
AC_DEFINE(MOZ_CAN_DRAW_IN_TITLEBAR)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_ERROR([Drawing in the titlebar is only supported on Windows and Macintosh targets])
|
AC_MSG_ERROR([Drawing in the titlebar is only supported on Windows targets])
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
@ -2914,14 +2797,6 @@ if test -z "$MOZ_SYSTEM_LIBVPX"; then
|
||||||
|
|
||||||
dnl See if we have assembly on this platform.
|
dnl See if we have assembly on this platform.
|
||||||
case "$OS_ARCH:$CPU_ARCH" in
|
case "$OS_ARCH:$CPU_ARCH" in
|
||||||
Darwin:x86)
|
|
||||||
VPX_USE_YASM=1
|
|
||||||
VPX_X86_ASM=1
|
|
||||||
;;
|
|
||||||
Darwin:x86_64)
|
|
||||||
VPX_USE_YASM=1
|
|
||||||
VPX_X86_ASM=1
|
|
||||||
;;
|
|
||||||
WINNT:x86_64)
|
WINNT:x86_64)
|
||||||
VPX_USE_YASM=1
|
VPX_USE_YASM=1
|
||||||
VPX_X86_ASM=1
|
VPX_X86_ASM=1
|
||||||
|
|
@ -3046,7 +2921,7 @@ dnl ========================================================
|
||||||
|
|
||||||
dnl If using Desktop Linux, ensure that the PA library is available
|
dnl If using Desktop Linux, ensure that the PA library is available
|
||||||
case "$OS_TARGET" in
|
case "$OS_TARGET" in
|
||||||
WINNT|Darwin|Android|OpenBSD)
|
WINNT)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
MOZ_PULSEAUDIO=1
|
MOZ_PULSEAUDIO=1
|
||||||
|
|
@ -3326,11 +3201,6 @@ MOZ_ARG_ENABLE_BOOL(gamepad,
|
||||||
|
|
||||||
if test "$MOZ_GAMEPAD"; then
|
if test "$MOZ_GAMEPAD"; then
|
||||||
case "$OS_TARGET" in
|
case "$OS_TARGET" in
|
||||||
Darwin)
|
|
||||||
if test -z "$MOZ_IOS"; then
|
|
||||||
MOZ_GAMEPAD_BACKEND=cocoa
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
WINNT)
|
WINNT)
|
||||||
MOZ_GAMEPAD_BACKEND=windows
|
MOZ_GAMEPAD_BACKEND=windows
|
||||||
;;
|
;;
|
||||||
|
|
@ -3378,14 +3248,6 @@ if test -n "$MOZ_LIBJPEG_TURBO" -a -n "$COMPILE_ENVIRONMENT"; then
|
||||||
|
|
||||||
dnl Do we support libjpeg-turbo on this platform?
|
dnl Do we support libjpeg-turbo on this platform?
|
||||||
case "$OS_ARCH:$CPU_ARCH" in
|
case "$OS_ARCH:$CPU_ARCH" in
|
||||||
Darwin:x86)
|
|
||||||
LIBJPEG_TURBO_ASFLAGS="-DPIC -DMACHO"
|
|
||||||
;;
|
|
||||||
Darwin:x86_64)
|
|
||||||
LIBJPEG_TURBO_ASFLAGS="-D__x86_64__ -DPIC -DMACHO"
|
|
||||||
;;
|
|
||||||
Darwin:arm*)
|
|
||||||
;;
|
|
||||||
WINNT:x86)
|
WINNT:x86)
|
||||||
LIBJPEG_TURBO_ASFLAGS="-DPIC -DWIN32"
|
LIBJPEG_TURBO_ASFLAGS="-DPIC -DWIN32"
|
||||||
;;
|
;;
|
||||||
|
|
@ -3465,9 +3327,6 @@ if test -n "$MOZ_LIBAV_FFT" -a -n "$COMPILE_ENVIRONMENT"; then
|
||||||
AC_DEFINE(MOZ_LIBAV_FFT)
|
AC_DEFINE(MOZ_LIBAV_FFT)
|
||||||
dnl Do we support libav-fft on this platform?
|
dnl Do we support libav-fft on this platform?
|
||||||
case "$OS_ARCH:$CPU_ARCH" in
|
case "$OS_ARCH:$CPU_ARCH" in
|
||||||
Darwin:x86_64)
|
|
||||||
LIBAV_FFT_ASFLAGS="-D__x86_64__ -DPIC -DMACHO"
|
|
||||||
;;
|
|
||||||
WINNT:x86)
|
WINNT:x86)
|
||||||
LIBAV_FFT_ASFLAGS="-DPIC -DWIN32"
|
LIBAV_FFT_ASFLAGS="-DPIC -DWIN32"
|
||||||
;;
|
;;
|
||||||
|
|
@ -3878,11 +3737,11 @@ if test -n "$MOZ_DEBUG"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "${OS_TARGET}" in
|
case "${OS_TARGET}" in
|
||||||
Android|WINNT|Darwin)
|
WINNT)
|
||||||
MOZ_GLUE_IN_PROGRAM=
|
MOZ_GLUE_IN_PROGRAM=
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
dnl On !Android !Windows !OSX, we only want to link executables against mozglue
|
dnl On !Windows, we only want to link executables against mozglue
|
||||||
MOZ_GLUE_IN_PROGRAM=1
|
MOZ_GLUE_IN_PROGRAM=1
|
||||||
AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
|
AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
|
||||||
;;
|
;;
|
||||||
|
|
@ -4852,13 +4711,6 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
|
||||||
|
|
||||||
if test "$MOZ_NECKO_WIFI"; then
|
if test "$MOZ_NECKO_WIFI"; then
|
||||||
case "$OS_TARGET" in
|
case "$OS_TARGET" in
|
||||||
Android)
|
|
||||||
;;
|
|
||||||
Darwin)
|
|
||||||
if test -z "$MOZ_IOS"; then
|
|
||||||
NECKO_WIFI=1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
DragonFly|FreeBSD|WINNT)
|
DragonFly|FreeBSD|WINNT)
|
||||||
NECKO_WIFI=1
|
NECKO_WIFI=1
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue