Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 11:27:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 674883 - Remove temporary workarounds in mozilla-central for bugs in NSPR

Browse Source
This commit is contained in:
Mike Hommey 2011-07-28 15:07:15 +02:00
parent b219a60505
commit de3333165c
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/nspr/Makefile.in
View File

@ -59,9 +59,6 @@ endif
ABS_DIST = $(call core_abspath,$(DIST)) ABS_DIST = $(call core_abspath,$(DIST))
libs:: libs::
# Temporary, until bug 655058 lands on nspr. When that happens, we can
# revert the config/nspr/* part of bug 654975.
$(MAKE) -C $(DEPTH)/nsprpub PROFILE_USE_CFLAGS="$(PROFILE_USE_CFLAGS)"
$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR= $(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR=
$(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin $(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin
$(RM) -rf $(DIST)/sdk/dummy $(RM) -rf $(DIST)/sdk/dummy
@ -76,6 +73,3 @@ install::
$(MAKE) -C $(DEPTH)/nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr $(MAKE) -C $(DEPTH)/nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4)) $(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties) $(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
clean distclean::
$(MAKE) -C $(DEPTH)/nsprpub $@

1
config/nspr/build.mk
View File

@ -38,5 +38,6 @@
TIERS += nspr TIERS += nspr
ifndef MOZ_NATIVE_NSPR ifndef MOZ_NATIVE_NSPR
tier_nspr_staticdirs += nsprpub
tier_nspr_dirs += config/nspr tier_nspr_dirs += config/nspr
endif endif

3
configure.in
View File

@ -6981,8 +6981,6 @@ arm-Android)
MOZ_ARCH=armv7-a MOZ_ARCH=armv7-a
MOZ_FPU=vfp MOZ_FPU=vfp
MOZ_FLOAT_ABI=softfp MOZ_FLOAT_ABI=softfp
# Temporarily set nspr flags via configure, until bug 674880 lands
NSPR_CONFIGURE_FLAGS="--with-thumb --with-arch=armv7-a --with-fpu=vfp --with-float-abi=softfp"
;; ;;
arm-*) arm-*)
if test -n "$MOZ_PLATFORM_MAEMO"; then if test -n "$MOZ_PLATFORM_MAEMO"; then
@ -9559,7 +9557,6 @@ if test -z "$MOZ_NATIVE_NSPR"; then
if test -n "$USE_ARM_KUSER"; then if test -n "$USE_ARM_KUSER"; then
ac_configure_args="$ac_configure_args --with-arm-kuser" ac_configure_args="$ac_configure_args --with-arm-kuser"
fi fi
ac_configure_args="$ac_configure_args $NSPR_CONFIGURE_FLAGS"
AC_OUTPUT_SUBDIRS(nsprpub) AC_OUTPUT_SUBDIRS(nsprpub)
ac_configure_args="$_SUBDIR_CONFIG_ARGS" ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi fi