[open-ils-commits] r19842 - branches/rel_2_0/Open-ILS/src/extras (miker)

svn at svn.open-ils.org svn at svn.open-ils.org
Mon Mar 21 18:35:13 EDT 2011


Author: miker
Date: 2011-03-21 18:35:07 -0400 (Mon, 21 Mar 2011)
New Revision: 19842

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

Modified: branches/rel_2_0/Open-ILS/src/extras/Makefile.install
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/Makefile.install	2011-03-21 22:34:35 UTC (rev 19841)
+++ branches/rel_2_0/Open-ILS/src/extras/Makefile.install	2011-03-21 22:35:07 UTC (rev 19842)
@@ -324,7 +324,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/
@@ -340,7 +340,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
 
 
 # Install libdbi and the postgres drivers



More information about the open-ils-commits mailing list