From 9f3542bba083f8a8c9a57c838540793b79168381 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Tue, 1 Nov 2011 07:46:33 +0000 Subject: [PATCH] Add --disable-shared-js to the spidermonkey configure script. Don't pass -o and -u to unzip... just -o (-u contradicts -o) --- 3rdp/build/Common.make | 2 +- 3rdp/build/GNUmakefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdp/build/Common.make b/3rdp/build/Common.make index d1defc96dc..e0760d5b46 100644 --- a/3rdp/build/Common.make +++ b/3rdp/build/Common.make @@ -1,3 +1,3 @@ -JS_LIB = $(3RDPODIR)$(DIRSEP)mozjs$(DIRSEP)lib$(DIRSEP)$(LIBPREFIX)mozjs185$(SOFILE) +JS_LIB = $(3RDPODIR)$(DIRSEP)mozjs$(DIRSEP)lib$(DIRSEP)$(LIBPREFIX)mozjs185$(LIBFILE) CRYPT_LIB = $(3RDPODIR)$(DIRSEP)cl$(DIRSEP)$(LIBPREFIX)cl$(LIBFILE) diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile index 49343fa999..7bee4532f7 100644 --- a/3rdp/build/GNUmakefile +++ b/3rdp/build/GNUmakefile @@ -4,7 +4,7 @@ SRC_ROOT = ../../src # Cross platform/compiler definitions include $(SRC_ROOT)/build/Common.gmake # defines clean and output directory rules -JS_CONFIGURE_ARGS += --with-system-nspr --disable-tests --enable-threadsafe --prefix=$(shell echo `pwd`$(DIRSEP)$(JS_IDIR)) +JS_CONFIGURE_ARGS += --with-system-nspr --disable-tests --disable-shared-js --enable-threadsafe --prefix=$(shell echo `pwd`$(DIRSEP)$(JS_IDIR)) ifdef DEBUG JS_CONFIGURE_ARGS += --enable-debug-symbols --disable-optimize else @@ -44,7 +44,7 @@ $(CRYPT_IDIR): | $(3RDPODIR) $(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip | $(CRYPT_SRC) $(CRYPT_IDIR) @echo Creating $@ ... $(QUIET)-rm -rf $(CRYPT_SRC)/* - $(QUIET)unzip -oua $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC) + $(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC) $(QUIET)env - PATH=$(PATH) make -C $(CRYPT_SRC) $(QUIET)cp $(CRYPT_SRC)$(DIRSEP)libcl.a $(CRYPT_IDIR) $(QUIET)cp $(CRYPT_SRC)$(DIRSEP)cryptlib.h $(CRYPT_IDIR) -- GitLab