[mw-devel] MW3 r1367 - in trunk: . mozjs17.0.0

[arthur at sucs.org]

Author: arthur
Date: 2014-05-30 14:51:25 +0100 (Fri, 30 May 2014)
New Revision: 1367

Modified:
   trunk/Makefile.common
   trunk/mozjs17.0.0/Makefile
   trunk/mw.spec
Log:
Try to fix rpm builds


Modified: trunk/Makefile.common
===================================================================
--- trunk/Makefile.common	2014-05-30 10:03:29 UTC (rev 1366)
+++ trunk/Makefile.common	2014-05-30 13:51:25 UTC (rev 1367)
@@ -42,7 +42,7 @@
 ifeq ($(JSFLAGS),)
 	JSDIR=$(DEPTH)mozjs
 	JSFLAGS= -include $(JSDIR)/include/js-17.0/js/RequiredDefines.h -I/usr/include/nspr -I$(JSDIR)/include/js-17.0
-	LDFLAGS += -L$(JSDIR)/lib/
+	LDFLAGS += -L$(JSDIR)/$(libdir)/
 	JSLIBS= -lmozjs-17.0
 	JSSCRIPTTYPE=JSScript
 endif

Modified: trunk/mozjs17.0.0/Makefile
===================================================================
--- trunk/mozjs17.0.0/Makefile	2014-05-30 10:03:29 UTC (rev 1366)
+++ trunk/mozjs17.0.0/Makefile	2014-05-30 13:51:25 UTC (rev 1367)
@@ -1,8 +1,11 @@
 .PHONY : all mozjs
 
+INSTALLDIR=$(PWD)/mozjs
+
 all: mozjs
 	
 mozjs:
-	cd js/src/ ; ./configure --enable-thread  --with-pthreads --prefix ../../../mozjs
+	cd js/src/ ; ./configure --enable-thread  --with-pthreads --prefix=/
 	make -C js/src/
-	make -C js/src/ install
+	/usr/bin/printenv
+	make -C js/src/ install DESTDIR=$(INSTALLDIR)

Modified: trunk/mw.spec
===================================================================
--- trunk/mw.spec	2014-05-30 10:03:29 UTC (rev 1366)
+++ trunk/mw.spec	2014-05-30 13:51:25 UTC (rev 1367)
@@ -11,7 +11,7 @@
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-BuildRequires: libtermcap-devel readline-devel glibc-devel sqlite-devel js-devel curl-devel openssl-devel jansson-devel postgresql-devel
+BuildRequires: libtermcap-devel readline-devel glibc-devel sqlite-devel curl-devel openssl-devel jansson-devel postgresql-devel cproto
 URL: http://projects.sucs.org/projects/mw/
 
 %description
@@ -29,6 +29,7 @@
 # We have a systemd unit file for mwserv so remove the sysv initscript
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 install -Dm 0644 mw.service $RPM_BUILD_ROOT/%{_unitdir}/mw.service
+install -D mozjs/%{_libdir}/libmozjs-17.0.so $RPM_BUILD_ROOT/%{_libdir}/
 mv $RPM_BUILD_ROOT%{_libdir}/mw/mwserv $RPM_BUILD_ROOT%{_bindir}
 %find_lang mw
 
@@ -65,6 +66,7 @@
 %defattr (755,mw,mw)
 %dir %{_libdir}/mw
 %{_libdir}/mw/colour
+%{_libdir}/libmozjs-17.0.so
 %attr(755,mw,mw) %dir /var/log/mw
 %attr(711,mw,mw) %dir /var/lib/mw
 %attr(755,mw,mw) %dir /var/run/mw