Bug 807488 - Remove build support for Photon, Irix and old Unix platforms r=callek
This commit is contained in:
Ian Neal
Родитель
7aea3c3cf3
Коммит
4f16a1b5c0
|
|
@ -79,13 +79,6 @@ endif
|
|||
CONFIG_TOOLS = $(MOZ_BUILD_ROOT)/mozilla/config
|
||||
AUTOCONF_TOOLS = $(MOZILLA_SRCDIR)/build/autoconf
|
||||
|
||||
ifeq ($(OS_ARCH),QNX)
|
||||
ifeq ($(OS_TARGET),NTO)
|
||||
LD := qcc -Vgcc_ntox86 -nostdlib
|
||||
else
|
||||
LD := $(CC)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_ARCH),BeOS)
|
||||
BEOS_ADDON_WORKAROUND = 1
|
||||
endif
|
||||
|
|
@ -95,7 +88,7 @@ endif
|
|||
# but save the version to allow multiple versions of the same base
|
||||
# platform to be built in the same tree.
|
||||
#
|
||||
ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
|
||||
ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
|
||||
OS_RELEASE := $(basename $(OS_RELEASE))
|
||||
|
||||
# Allow the user to ignore the OS_VERSION, which is usually irrelevant.
|
||||
|
|
|
|||
|
|
@ -543,17 +543,6 @@ endif # HAS_EXTRAEXPORTS
|
|||
endif # IS_COMPONENT
|
||||
endif # AIX
|
||||
|
||||
#
|
||||
# OSF1: add -B symbolic flag for components
|
||||
#
|
||||
ifeq ($(OS_ARCH),OSF1)
|
||||
ifdef IS_COMPONENT
|
||||
ifeq ($(GNU_CC)$(GNU_CXX),)
|
||||
EXTRA_DSO_LDOPTS += -B symbolic
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Linux: add -Bsymbolic flag for components
|
||||
#
|
||||
|
|
|
|||
259
configure.in
259
configure.in
|
|
@ -990,44 +990,12 @@ solaris*)
|
|||
BSD_386)
|
||||
HOST_OS_ARCH=BSD
|
||||
;;
|
||||
dgux)
|
||||
HOST_OS_ARCH=DGUX
|
||||
;;
|
||||
IRIX64)
|
||||
HOST_OS_ARCH=IRIX
|
||||
;;
|
||||
UNIX_SV)
|
||||
if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then
|
||||
HOST_OS_ARCH=NCR
|
||||
else
|
||||
HOST_OS_ARCH=UNIXWARE
|
||||
fi
|
||||
;;
|
||||
ncr)
|
||||
HOST_OS_ARCH=NCR
|
||||
;;
|
||||
UNIX_SYSTEM_V)
|
||||
HOST_OS_ARCH=NEC
|
||||
;;
|
||||
OSF1)
|
||||
;;
|
||||
*OpenVMS*)
|
||||
HOST_OS_ARCH=OpenVMS
|
||||
;;
|
||||
OS_2)
|
||||
HOST_OS_ARCH=OS2
|
||||
;;
|
||||
QNX)
|
||||
;;
|
||||
SCO_SV)
|
||||
HOST_OS_ARCH=SCOOS
|
||||
;;
|
||||
SINIX-N | SINIX-Y | SINIX-Z |ReliantUNIX-M)
|
||||
HOST_OS_ARCH=SINIX
|
||||
;;
|
||||
UnixWare)
|
||||
HOST_OS_ARCH=UNIXWARE
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$OS_ARCH" in
|
||||
|
|
@ -1069,39 +1037,6 @@ AIX)
|
|||
BSD_386)
|
||||
OS_ARCH=BSD
|
||||
;;
|
||||
dgux)
|
||||
OS_ARCH=DGUX
|
||||
;;
|
||||
IRIX64)
|
||||
OS_ARCH=IRIX
|
||||
;;
|
||||
UNIX_SV)
|
||||
if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then
|
||||
OS_ARCH=NCR
|
||||
else
|
||||
OS_ARCH=UNIXWARE
|
||||
OS_RELEASE=`uname -v`
|
||||
fi
|
||||
;;
|
||||
ncr)
|
||||
OS_ARCH=NCR
|
||||
;;
|
||||
UNIX_SYSTEM_V)
|
||||
OS_ARCH=NEC
|
||||
;;
|
||||
OSF1)
|
||||
case `uname -v` in
|
||||
148)
|
||||
OS_RELEASE=V3.2C
|
||||
;;
|
||||
564)
|
||||
OS_RELEASE=V4.0B
|
||||
;;
|
||||
878)
|
||||
OS_RELEASE=V4.0D
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*OpenVMS*)
|
||||
OS_ARCH=OpenVMS
|
||||
OS_RELEASE=`uname -v`
|
||||
|
|
@ -1112,26 +1047,6 @@ OS_2)
|
|||
OS_TARGET=OS2
|
||||
OS_RELEASE=`uname -v`
|
||||
;;
|
||||
QNX)
|
||||
if test "$OS_TARGET" != "NTO"; then
|
||||
changequote(,)
|
||||
OS_RELEASE=`uname -v | sed 's/^\([0-9]\)\([0-9]*\)$/\1.\2/'`
|
||||
changequote([,])
|
||||
fi
|
||||
OS_TEST=x86
|
||||
;;
|
||||
SCO_SV)
|
||||
OS_ARCH=SCOOS
|
||||
OS_RELEASE=5.0
|
||||
;;
|
||||
SINIX-N | SINIX-Y | SINIX-Z |ReliantUNIX-M)
|
||||
OS_ARCH=SINIX
|
||||
OS_TEST=`uname -p`
|
||||
;;
|
||||
UnixWare)
|
||||
OS_ARCH=UNIXWARE
|
||||
OS_RELEASE=`uname -v`
|
||||
;;
|
||||
Darwin)
|
||||
case "${target_cpu}" in
|
||||
i*86*)
|
||||
|
|
@ -1149,12 +1064,6 @@ Darwin)
|
|||
;;
|
||||
esac
|
||||
|
||||
if test "$OS_ARCH" = "NCR"; then
|
||||
changequote(,)
|
||||
OS_RELEASE=`awk '{print $3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$/\2.\3/'`
|
||||
changequote([,])
|
||||
fi
|
||||
|
||||
# Only set CPU_ARCH if we recognize the value of OS_TEST
|
||||
|
||||
case "$OS_TEST" in
|
||||
|
|
@ -1536,12 +1445,6 @@ case "$host" in
|
|||
MOZ_FIX_LINK_PATHS=
|
||||
;;
|
||||
|
||||
*-osf*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
||||
HOST_NSPR_MDCPUCFG='\"md/_osf1.cfg\"'
|
||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
|
||||
;;
|
||||
|
||||
*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
|
||||
|
|
@ -1738,66 +1641,6 @@ ia64*-hpux*)
|
|||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
;;
|
||||
|
||||
*-irix5*)
|
||||
AC_DEFINE(IRIX)
|
||||
DSO_LDOPTS='-elf -shared'
|
||||
|
||||
if test "$GNU_CC"; then
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
MKSHLIB_FORCE_ALL='-Wl,-all'
|
||||
MKSHLIB_UNFORCE_ALL='-Wl,-none'
|
||||
CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
|
||||
else
|
||||
MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
|
||||
MKSHLIB_FORCE_ALL='-all'
|
||||
MKSHLIB_UNFORCE_ALL='-none'
|
||||
fi
|
||||
;;
|
||||
|
||||
*-irix6*)
|
||||
AC_DEFINE(IRIX)
|
||||
dnl the irix specific xptcinvoke code is written against the n32 ABI so we *must*
|
||||
dnl compile and link using -n32
|
||||
USE_N32=1
|
||||
TARGET_COMPILER_ABI=n32
|
||||
DSO_LDOPTS='-elf -shared'
|
||||
MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
_MOZ_EXCEPTIONS_FLAGS_OFF="-LANG:exceptions=OFF"
|
||||
_MOZ_EXCEPTIONS_FLAGS_ON="-LANG:exceptions=ON"
|
||||
if test "$GNU_CC"; then
|
||||
MKSHLIB_FORCE_ALL='-Wl,-all'
|
||||
MKSHLIB_UNFORCE_ALL='-Wl,-none'
|
||||
_WARNINGS_CFLAGS="-Wall"
|
||||
_WARNINGS_CXXFLAGS="-Wall"
|
||||
CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
|
||||
else
|
||||
MKSHLIB_FORCE_ALL='-all'
|
||||
MKSHLIB_UNFORCE_ALL='-none'
|
||||
AR_LIST="$AR t"
|
||||
AR_EXTRACT="$AR x"
|
||||
AR_DELETE="$AR d"
|
||||
AR='$(CXX) -ar'
|
||||
AR_FLAGS='-o $@'
|
||||
CFLAGS="$CFLAGS -woff 3262 -G 4"
|
||||
CXXFLAGS="$CXXFLAGS -woff 3262 -G 4"
|
||||
if test -n "$USE_N32"; then
|
||||
ASFLAGS="$ASFLAGS -n32"
|
||||
CFLAGS="$CFLAGS -n32"
|
||||
CXXFLAGS="$CXXFLAGS -n32"
|
||||
LDFLAGS="$LDFLAGS -n32"
|
||||
fi
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
AC_MSG_WARN([Clearing MOZ_FIX_LINK_PATHS for OSF/1 as fix for bug 333545 (till the reference bug 332075 is fixed.])
|
||||
MOZ_FIX_LINK_PATHS=
|
||||
fi
|
||||
if test -z "$GNU_CXX"; then
|
||||
MIPSPRO_CXX=1
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*linux*)
|
||||
# Note: both GNU_CC and INTEL_CC are set when using Intel's C compiler.
|
||||
# Similarly for GNU_CXX and INTEL_CXX.
|
||||
|
|
@ -2053,37 +1896,6 @@ ia64*-hpux*)
|
|||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
|
||||
;;
|
||||
|
||||
*-nto*)
|
||||
AC_DEFINE(NTO)
|
||||
AC_DEFINE(_QNX_SOURCE)
|
||||
AC_DEFINE(_i386)
|
||||
OS_TARGET=NTO
|
||||
WARNINGS_AS_ERRORS=''
|
||||
MOZ_OPTIMIZE_FLAGS="-O"
|
||||
MOZ_DEBUG_FLAGS="-gstabs"
|
||||
USE_PTHREADS=1
|
||||
_PEDANTIC=
|
||||
LIBS="$LIBS -lsocket -lstdc++"
|
||||
_DEFINES_CFLAGS='-include $(DEPTH)/comm-config.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
|
||||
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/comm-config.h -D_POSIX_C_SOURCE=199506'
|
||||
if test "$with_x" != "yes"
|
||||
then
|
||||
_PLATFORM_DEFAULT_TOOLKIT="photon"
|
||||
TK_CFLAGS='-I/usr/include/photon'
|
||||
TK_LIBS='-lph'
|
||||
fi
|
||||
case "${target_cpu}" in
|
||||
ppc*)
|
||||
AC_DEFINE(HAVE_VA_LIST_AS_ARRAY)
|
||||
;;
|
||||
esac
|
||||
case "${host_cpu}" in
|
||||
i*86)
|
||||
USE_ELF_DYNSTR_GC=1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
*-openbsd*)
|
||||
if test "$SO_VERSION"; then
|
||||
DLL_SUFFIX=".so.$SO_VERSION"
|
||||
|
|
@ -2181,56 +1993,6 @@ ia64*-hpux*)
|
|||
fi
|
||||
;;
|
||||
|
||||
alpha*-*-osf*)
|
||||
if test "$GNU_CC"; then
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
|
||||
|
||||
else
|
||||
MOZ_DEBUG_FLAGS='-g'
|
||||
ASFLAGS='-I$(MOZILLA_SRCDIR)/xpcom/reflect/xptcall/public -g'
|
||||
CFLAGS="$CFLAGS -ieee"
|
||||
CXXFLAGS="$CXXFLAGS "'-noexceptions -ieee -ptr $(DIST)/cxx_repository'
|
||||
DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations'
|
||||
DSO_CFLAGS=
|
||||
DSO_PIC_CFLAGS=
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
|
||||
MKSHLIB_FORCE_ALL='-all'
|
||||
MKSHLIB_UNFORCE_ALL='-none'
|
||||
dnl Might fix the libxpcom.so breakage on this platform as well....
|
||||
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
fi
|
||||
if test -z "$GNU_CXX"; then
|
||||
COMPAQ_CXX=1
|
||||
fi
|
||||
AC_DEFINE(NEED_USLEEP_PROTOTYPE)
|
||||
;;
|
||||
|
||||
*-qnx*)
|
||||
DIRENT_INO=d_stat.st_ino
|
||||
dnl Solves the problems the QNX compiler has with nsCOMPtr.h.
|
||||
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
dnl Explicit set STDC_HEADERS to workaround QNX 6.0's failing of std test
|
||||
AC_DEFINE(STDC_HEADERS)
|
||||
if test "$no_x" = "yes"; then
|
||||
_PLATFORM_DEFAULT_TOOLKIT='photon'
|
||||
TK_CFLAGS='-I/usr/nto/include/photon'
|
||||
TK_LIBS='-lphoton -lphrender'
|
||||
fi
|
||||
;;
|
||||
|
||||
*-sco*)
|
||||
AC_DEFINE(NSCAP_DISABLE_TEST_DONTQUERY_CASES)
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
|
||||
if test ! "$GNU_CC"; then
|
||||
DSO_LDOPTS='-G'
|
||||
fi
|
||||
;;
|
||||
|
||||
*-solaris*)
|
||||
AC_DEFINE(SOLARIS)
|
||||
TARGET_NSPR_MDCPUCFG='\"md/_solaris.cfg\"'
|
||||
|
|
@ -2327,10 +2089,6 @@ alpha*-*-osf*)
|
|||
esac
|
||||
;;
|
||||
|
||||
*-sysv4.2uw7*)
|
||||
NSPR_LIBS="-lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION -L/usr/ccs/lib -lcrt"
|
||||
;;
|
||||
|
||||
*-os2*)
|
||||
HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
|
||||
;;
|
||||
|
|
@ -2390,9 +2148,6 @@ case "$target" in
|
|||
fi
|
||||
fi
|
||||
;;
|
||||
*-nto*)
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(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'
|
||||
;;
|
||||
|
|
@ -3050,10 +2805,6 @@ then
|
|||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-*-nto*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-aix4.3*|*-aix5*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
|
@ -3062,10 +2813,6 @@ then
|
|||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
alpha*-*-osf*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
|
||||
*-*-solaris*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
if test "$SOLARIS_SUNPRO_CC"; then
|
||||
|
|
@ -4257,7 +4004,6 @@ MOZ_ARG_HEADER(Toolkit Options)
|
|||
Platform specific defaults:
|
||||
BeOS - cairo-beos
|
||||
Mac OS X - cairo-cocoa
|
||||
Neutrino/QNX - photon
|
||||
OS/2 - cairo-os2
|
||||
Win32/WinCE - cairo-windows
|
||||
Gtk2 with DirectFB - cairo-gtk2-dfb
|
||||
|
|
@ -4266,8 +4012,7 @@ MOZ_ARG_HEADER(Toolkit Options)
|
|||
[ _DEFAULT_TOOLKIT=$enableval ],
|
||||
[ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT])
|
||||
|
||||
if test "$_DEFAULT_TOOLKIT" = "photon" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "cairo-windows" \
|
||||
if test "$_DEFAULT_TOOLKIT" = "cairo-windows" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2-dfb" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2-x11" \
|
||||
|
|
@ -4288,8 +4033,6 @@ dnl = Enable the toolkit as needed =
|
|||
dnl ========================================================
|
||||
|
||||
case "$MOZ_WIDGET_TOOLKIT" in
|
||||
photon)
|
||||
;;
|
||||
|
||||
cairo-windows)
|
||||
MOZ_WIDGET_TOOLKIT=windows
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче