зеркало из https://github.com/mozilla/pjs.git
Setting autoconf as the default build method for NSPR on the NSPRPUB_CLIENT_BRANCH
Bug #58804
This commit is contained in:
cls%seawood.org
Родитель
66310d6fbd
Коммит
4f9266b3ff
|
|
@ -48,8 +48,6 @@ Makefile
|
|||
build/Makefile
|
||||
build/unix/Makefile
|
||||
build/unix/mozilla-config
|
||||
build/unix/nspr_my_config.mk
|
||||
build/unix/nspr_my_overrides.mk
|
||||
config/Makefile
|
||||
config/autoconf.mk
|
||||
config/mkdepend/Makefile
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
184
configure.in
184
configure.in
|
|
@ -3696,11 +3696,6 @@ MOZ_ARG_ENABLE_BOOL(idltool,
|
|||
[ --enable-idlc Build idl tool (default=no) ],
|
||||
BUILD_IDLC=1)
|
||||
|
||||
USE_NSPR_AUTOCONF=
|
||||
MOZ_ARG_ENABLE_BOOL(nspr-autoconf,
|
||||
[ --enable-nspr-autoconf Use autoconf when building nspr],
|
||||
USE_NSPR_AUTOCONF=1)
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(xterm-updates,
|
||||
[ --enable-xterm-updates Update XTERM titles with current command.],
|
||||
MOZ_UPDATE_XTERM=1)
|
||||
|
|
@ -4200,7 +4195,6 @@ AC_SUBST(NSPR_INCLUDE_DIR)
|
|||
AC_SUBST(NSPR_CFLAGS)
|
||||
AC_SUBST(NSPR_LIBS)
|
||||
AC_SUBST(MOZ_NATIVE_NSPR)
|
||||
AC_SUBST(USE_NSPR_AUTOCONF)
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CXXFLAGS)
|
||||
|
|
@ -4324,167 +4318,6 @@ for lib_arg in $NSPR_LIBS $TK_LIBS; do
|
|||
done
|
||||
AC_SUBST(LIBS_PATH)
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Support for feeding NSPR environment variables via
|
||||
dnl = a file as opposed to the environment itself.
|
||||
dnl =
|
||||
dnl = The following 2 files get generated by configure and
|
||||
dnl = copied into
|
||||
dnl =
|
||||
dnl = build/unix/nspr_my_config.mk support
|
||||
dnl = build/unix/nspr_my_override.mk support
|
||||
dnl =
|
||||
dnl = nsprpub/config
|
||||
dnl =
|
||||
dnl = NSPR will then include these files in its build environment.
|
||||
dnl =
|
||||
dnl = The following variables might need to be set to properly
|
||||
dnl = build NSPR for unix:
|
||||
dnl =
|
||||
dnl = my_config.mk:
|
||||
dnl =
|
||||
dnl = USE_PTHREADS
|
||||
dnl = BUILD_OPT
|
||||
dnl = NS_USE_GCC
|
||||
dnl = NO_MDUPDATE
|
||||
dnl = NS_USE_NATIVE
|
||||
dnl = MOZILLA_CLIENT
|
||||
dnl = CLASSIC_NSPR
|
||||
dnl =
|
||||
dnl = my_overrides.mk:
|
||||
dnl =
|
||||
dnl = DIST
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
if test -z "$MOZ_NATIVE_NSPR" && test -z "$USE_NSPR_AUTOCONF"
|
||||
then
|
||||
dnl
|
||||
dnl USE_PTHREADS
|
||||
dnl
|
||||
dnl This flag controls whether NSPR use pthreads, which are usually
|
||||
dnl native to many unices, to implement multithreading. On systems
|
||||
dnl which dont support pthreads, NSPR uses its own user threads
|
||||
dnl implementation.
|
||||
dnl
|
||||
dnl Different unices have different defaults for USE_PTHREADS within
|
||||
dnl NSPR. Since at this point in configure.in, we know what we
|
||||
dnl want, we force USE_PTHREADS to the correct value.
|
||||
dnl
|
||||
|
||||
dnl
|
||||
dnl USE_PTHREADS
|
||||
dnl
|
||||
dnl Same as detected above.
|
||||
dnl
|
||||
MOZ_NSPRENV_USE_PTHREADS=$USE_PTHREADS
|
||||
|
||||
dnl
|
||||
dnl GC_LEAK_DETECTOR
|
||||
dnl
|
||||
MOZ_NSPRENV_GC_LEAK_DETECTOR=$GC_LEAK_DETECTOR
|
||||
|
||||
dnl
|
||||
dnl CLASSIC_NSPR
|
||||
dnl
|
||||
dnl On Linux libc5, CLASSIC_NSPR needs to be set so that NSPR chooses
|
||||
dnl the correct threading implementation (user threads - not pthreads).
|
||||
dnl On Linux, CLASSIC_NSPR's only purpose to to control linking against
|
||||
dnl libpthreads.
|
||||
dnl
|
||||
MOZ_NSPRENV_CLASSIC_NSPR=
|
||||
case "$target" in
|
||||
*-linux*)
|
||||
if test "$USE_PTHREADS"x = x
|
||||
then
|
||||
MOZ_NSPRENV_CLASSIC_NSPR=1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl
|
||||
dnl BUILD_OPT
|
||||
dnl
|
||||
dnl This flag controls whether NSPR is built with debug info
|
||||
dnl
|
||||
if test "$MOZ_DEBUG"
|
||||
then
|
||||
MOZ_NSPRENV_BUILD_OPT=
|
||||
else
|
||||
MOZ_NSPRENV_BUILD_OPT=1
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl NS_USE_GCC
|
||||
dnl NS_USE_NATIVE
|
||||
dnl
|
||||
dnl These are NSPR's way of switching between "native" and GNU compilers
|
||||
dnl
|
||||
if test "$GNU_CC"
|
||||
then
|
||||
MOZ_NSPRENV_NS_USE_GCC=1
|
||||
MOZ_NSPRENV_NS_USE_NATIVE=
|
||||
else
|
||||
MOZ_NSPRENV_NS_USE_NATIVE=1
|
||||
MOZ_NSPRENV_NS_USE_GCC=
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl NO_MDUPDATE
|
||||
dnl
|
||||
dnl These are set just to be safe. It is possible that NSPR doesnt
|
||||
dnl use these anymore.
|
||||
dnl
|
||||
MOZ_NSPRENV_NO_MDUPDATE=1
|
||||
|
||||
dnl
|
||||
dnl MOZILLA_CLIENT
|
||||
dnl
|
||||
MOZ_NSPRENV_MOZILLA_CLIENT=
|
||||
|
||||
dnl
|
||||
dnl DIST
|
||||
dnl
|
||||
dnl Where the NSPR stuff gets installed: $DIST/{bin,lib,include}
|
||||
dnl
|
||||
MOZ_NSPRENV_DIST=`pwd`/dist
|
||||
case "$target" in
|
||||
*-*-os2*)
|
||||
MOZ_NSPRENV_DIST=`pwd -D | sed s/^.://`
|
||||
MOZ_NSPRENV_DIST="$ROOT""$MOZ_NSPRENV_DIST/dist"
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl
|
||||
dnl MAKE
|
||||
dnl
|
||||
dnl NSPR is not safe for gnu make -jX (where X > 1) builds. Force make
|
||||
dnl in NSPR to be 'make -j1' - or just 'make'
|
||||
dnl
|
||||
case "$target" in
|
||||
*-linux*)
|
||||
MOZ_NSPRENV_OVERRIDE_MAKE=`echo $MAKE | $AWK '{print \$1}'`
|
||||
;;
|
||||
|
||||
*)
|
||||
MOZ_NSPRENV_OVERRIDE_MAKE=
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(MOZ_NSPRENV_USE_PTHREADS)
|
||||
AC_SUBST(MOZ_NSPRENV_BUILD_OPT)
|
||||
AC_SUBST(MOZ_NSPRENV_NS_USE_GCC)
|
||||
AC_SUBST(MOZ_NSPRENV_NO_MDUPDATE)
|
||||
AC_SUBST(MOZ_NSPRENV_NS_USE_NATIVE)
|
||||
AC_SUBST(MOZ_NSPRENV_MOZILLA_CLIENT)
|
||||
AC_SUBST(MOZ_NSPRENV_CLASSIC_NSPR)
|
||||
AC_SUBST(MOZ_NSPRENV_DIST)
|
||||
AC_SUBST(MOZ_NSPRENV_OVERRIDE_MAKE)
|
||||
AC_SUBST(MOZ_NSPRENV_GC_LEAK_DETECTOR)
|
||||
fi
|
||||
dnl ========================================================
|
||||
|
||||
|
||||
dnl Spit out some output
|
||||
dnl ========================================================
|
||||
|
||||
|
|
@ -4541,21 +4374,6 @@ echo $MAKEFILES > unallmakefiles
|
|||
|
||||
AC_OUTPUT($MAKEFILES)
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = If we are building NSPR as part of the build, make sure
|
||||
dnl = the NSPR environment config and override files get copied
|
||||
dnl = to the right place.
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
if test ! "$MOZ_NATIVE_NSPR" && test -z "$USE_NSPR_AUTOCONF"
|
||||
then
|
||||
rm -f ${srcdir}/nsprpub/config/my_config.mk
|
||||
rm -f ${srcdir}/nsprpub/config/my_overrides.mk
|
||||
cp build/unix/nspr_my_config.mk ${srcdir}/nsprpub/config/my_config.mk
|
||||
cp build/unix/nspr_my_overrides.mk ${srcdir}/nsprpub/config/my_overrides.mk
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Setup a nice relatively clean build environment for
|
||||
dnl = sub-configures.
|
||||
|
|
@ -4575,7 +4393,7 @@ DLLTOOL=
|
|||
unset MAKEFILES
|
||||
unset CONFIG_FILES
|
||||
|
||||
if test -z "$MOZ_NATIVE_NSPR" && test -n "$USE_NSPR_AUTOCONF"; then
|
||||
if test -z "$MOZ_NATIVE_NSPR"; then
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
|
||||
AC_OUTPUT_SUBDIRS(nsprpub)
|
||||
fi
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче