Commit 4fbe9238 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 648407 - Allow to fold NSPR, NSS and SQLite libraries all together. r=ted

parent b8333c74

b2g/installer/package-manifest.in

+6 −2
Original line number Diff line number Diff line
@@ -49,10 +49,12 @@ 
#ifndef MOZ_STATIC_JS

@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@

#endif

#ifndef MOZ_FOLD_LIBS

@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@

#endif

@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@

#ifdef MOZ_DMD

@BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@
@@ -640,11 +642,13 @@ 
@BINPATH@/components/pipnss.xpt

@BINPATH@/components/pippki.xpt

@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@

#ifndef MOZ_FOLD_LIBS

@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@

#endif

@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@

#ifndef CROSS_COMPILE

@BINPATH@/@DLL_PREFIX@freebl3.chk

@BINPATH@/@DLL_PREFIX@softokn3.chk

browser/installer/package-manifest.in

+7 −1
Original line number Diff line number Diff line
@@ -63,10 +63,12 @@ 
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@

#endif

#ifndef MOZ_NATIVE_NSPR

#ifndef MOZ_FOLD_LIBS

@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@

#endif

#endif

@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@

#ifdef XP_MACOSX

@BINPATH@/XUL
@@ -120,8 +122,10 @@ 
@BINPATH@/platform.ini

#ifndef XP_OS2

#ifndef MOZ_NATIVE_SQLITE

#ifndef MOZ_FOLD_LIBS

@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@

#endif

#endif

#else

@BINPATH@/mozsqlt3@DLL_SUFFIX@

#endif
@@ -656,11 +660,13 @@ 
#ifndef NSS_DISABLE_DBM

@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@

#endif

#ifndef MOZ_FOLD_LIBS

@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@

@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@

#endif

@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@

#endif

@BINPATH@/chrome/pippki@JAREXT@

@BINPATH@/chrome/pippki.manifest

@BINPATH@/components/pipboot.xpt

config/nspr/Makefile.in

+14 −1
Original line number Diff line number Diff line
@@ -22,8 +22,21 @@ endif 
# Copy NSPR to the SDK

ABS_DIST = $(call core_abspath,$(DIST))



ifdef MOZ_FOLD_LIBS

# Trick the nspr build system into not building shared libraries.

# bug #851869.

EXTRA_MAKE_FLAGS := SHARED_LIBRARY= IMPORT_LIBRARY= SHARED_LIB_PDB=



# Work around libVersionPoint conflict between all three libraries.

# See bug #838566.

EXTRA_MAKE_FLAGS += XP_DEFINE=-DlibVersionPoint='libVersionPoint$$(LIBRARY_NAME)'

endif



libs export clean distclean::

	$(MAKE) -C $(DEPTH)/nsprpub $@ $(EXTRA_MAKE_FLAGS)



libs::

	$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include/nspr 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/nspr libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR= $(EXTRA_MAKE_FLAGS)

	$(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin

	$(RM) -rf $(DIST)/sdk/dummy

ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) # {

configure.in

+10 −4
Original line number Diff line number Diff line
@@ -3965,12 +3965,17 @@ if test -n "$MOZ_NATIVE_NSS"; then 
   NSS_LIBS="$NSS_LIBS -lcrmf"

else

   NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'

   if test -z "$IMPORT_LIB_SUFFIX"; then

       DLL_LINK_SUFFIX='$(DLL_SUFFIX)'

   else

       DLL_LINK_SUFFIX='$(IMPORT_LIB_SUFFIX)'

   fi

   NSS_DEP_LIBS="\

        \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)ssl$NSS_VERSION\$(DLL_SUFFIX) \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nss$NSS_VERSION\$(DLL_SUFFIX) \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nssutil$NSS_VERSION\$(DLL_SUFFIX)"

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION${DLL_LINK_SUFFIX} \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)ssl$NSS_VERSION${DLL_LINK_SUFFIX} \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nss$NSS_VERSION${DLL_LINK_SUFFIX} \

        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nssutil$NSS_VERSION${DLL_LINK_SUFFIX}"



   if test -z "$GNU_CC" -a "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "OS2"; then

       NSS_LIBS="\
@@ -8861,6 +8866,7 @@ AC_SUBST(LIBJPEG_TURBO_X64_ASM) 
AC_SUBST(LIBJPEG_TURBO_ARM_ASM)



AC_SUBST(MOZ_PACKAGE_JSSHELL)

AC_SUBST(MOZ_FOLD_LIBS)



AC_MSG_CHECKING([for posix_fallocate])

AC_TRY_LINK([#define _XOPEN_SOURCE 600

db/sqlite3/src/Makefile.in

+4 −0
Original line number Diff line number Diff line
@@ -13,7 +13,11 @@ include $(DEPTH)/config/autoconf.mk 
MODULE           = sqlite3

LIBRARY_NAME     = mozsqlite3

SHORT_LIBNAME    = mozsqlt3

ifdef MOZ_FOLD_LIBS

FORCE_STATIC_LIB = 1

else

FORCE_SHARED_LIB = 1

endif

VISIBILITY_FLAGS =

LIB_IS_C_ONLY    = 1