Ticket #2442: blind_SpiderMonkeyMacOsX.patch

libraries/osx/build-osx-libs.sh

@@ -524 +524 @@
 # --------------------------------------------------------------------
 echo -e "Building Spidermonkey..."
 
-LIB_VERSION="js185-1.0.0"
-LIB_ARCHIVE="$LIB_VERSION.tar.gz"
-LIB_DIRECTORY="js-1.8.5"
+LIB_VERSION="mozjs-24.2.0"
+LIB_ARCHIVE="$LIB_VERSION.tar.bz2"
+LIB_DIRECTORY="mozjs24"
+INCLUDE_DIR_DEBUG=include-unix-debug
+INCLUDE_DIR_RELEASE=include-unix-release
 
 pushd ../source/spidermonkey/ > /dev/null
 
@@ -538 +540 @@
   rm -f lib/*.a
   rm -rf $LIB_DIRECTORY
   tar -xf $LIB_ARCHIVE
+  # rename the extracted directory to something shorter
+  mv $LIB_VERSION $LIB_DIRECTORY 
   pushd $LIB_DIRECTORY/js/src
 
+  # nspr must be installed for a threadsafe build
+  # (download if not preinstalled: https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/)
+  NSPR_INCLUDES="`pkg-config nspr --cflags`"
+  NSPR_LIBS="`pkg-config nspr --libs`"
+
   # We want separate debug/release versions of the library, so change their install name in the Makefile
-  sed -i.bak -e 's/\(STATIC_LIBRARY_NAME),mozjs185-\)\(\$(SRCREL_ABI_VERSION)\)\{0,1\}/\1ps-debug/' Makefile.in
+  perl -i.bak -pe 's/(^STATIC_LIBRARY_NAME\s+=).*/$1mozjs24-ps-debug/' Makefile.in
 
-  CONF_OPTS="--prefix=${INSTALL_DIR} --disable-tests --disable-shared-js"
+  CONF_OPTS="--prefix=${INSTALL_DIR} --enable-threadsafe --disable-tests --disable-shared-js" # --enable-trace-logging"
   # Uncomment this line for 32-bit 10.5 cross compile:
   #CONF_OPTS="$CONF_OPTS --target=i386-apple-darwin9.0.0"
   if [[ $MIN_OSX_VERSION && ${MIN_OSX_VERSION-_} ]]; then
@@ -555 +564 @@
 
   mkdir -p build-debug
   pushd build-debug
-  (CC="$CC -arch $ARCH" CXX="$CXX -arch $ARCH" AR=ar CROSS_COMPILE=1 ../configure $CONF_OPTS --enable-debug --disable-optimize && make ${JOBS} && make install) || die "Spidermonkey build failed"
+  (CC="clang -arch $ARCH" CXX="clang++ -arch $ARCH" AR=ar CROSS_COMPILE=1 ../configure $CONF_OPTS --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" && make ${JOBS} && make install) || die "Spidermonkey build failed" 
+  # js-config.h is different for debug and release builds, so we need different include directories for both
+  mkdir -p ${INCLUDE_DIR_DEBUG}
+  cp -R -L dist/include/* ${INCLUDE_DIR_DEBUG}/
   popd
   mv Makefile.in.bak Makefile.in
-  
-  sed -i.bak -e 's/\(STATIC_LIBRARY_NAME),mozjs185-\)\(\$(SRCREL_ABI_VERSION)\)\{0,1\}/\1ps-release/' Makefile.in
 
+  perl -i.bak -pe 's/(^STATIC_LIBRARY_NAME\s+=).*/$1mozjs24-ps-release/' Makefile.in
   mkdir -p build-release
   pushd build-release
-  (CC="$CC -arch $ARCH" CXX="$CXX -arch $ARCH" AR=ar CROSS_COMPILE=1 ../configure $CONF_OPTS && make ${JOBS} && make install) || die "Spidermonkey build failed"
+  (CC="clang -arch $ARCH" CXX="clang++ -arch $ARCH" AR=ar CROSS_COMPILE=1 ../configure $CONF_OPTS --enable-optimize --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" && make ${JOBS} && make install) || die "Spidermonkey build failed"
+  # js-config.h is different for debug and release builds, so we need different include directories for both
+  mkdir -p ${INCLUDE_DIR_RELEASE}
+  cp -R -L dist/include/* ${INCLUDE_DIR_RELEASE}/
   popd
   mv Makefile.in.bak Makefile.in