[open-ils-commits] r19840 - trunk/Open-ILS/src/extras (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2011-03-21 18:34:05 -0400 (Mon, 21 Mar 2011)
New Revision: 19840

Modified:
   trunk/Open-ILS/src/extras/Makefile.install
Log:
Remove thready building -- we do not use threads anyway, and it breaks JS::SM

Modified: trunk/Open-ILS/src/extras/Makefile.install
===================================================================
--- trunk/Open-ILS/src/extras/Makefile.install	2011-03-21 20:13:44 UTC (rev 19839)
+++ trunk/Open-ILS/src/extras/Makefile.install	2011-03-21 22:34:05 UTC (rev 19840)
@@ -326,7 +326,7 @@
 install_libjs: 
 	if [ ! -f $(LIBJS).tar.gz ]; then wget $(LIBJS_URL); fi;
 	tar -zxf $(LIBJS).tar.gz
-	cd js/src/ && JS_THREADSAFE=true JS_DIST=/usr make -f Makefile.ref
+	cd js/src/ && JS_DIST=/usr make -f Makefile.ref
 	mkdir -p $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
@@ -342,7 +342,7 @@
 	if [ ! -z $(FEDORA) ]; then \
 		sed -i -e 's/js32.dll/libjs.so/' $(LIBJS_PERL)/Makefile.PL ; \
 	fi;
-	cd $(LIBJS_PERL) && perl Makefile.PL -E4X -JS_THREADSAFE && make && make test && make install
+	cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
 
 # On Ubuntu and possibly Debian, the libdbi0 package prevents the 
 # compiled-from-source version from being used and breaks the install.