Skip to content
Snippets Groups Projects
Commit 807f6ede authored by Justin Mitchell's avatar Justin Mitchell
Browse files

Try to fix rpm builds

parent 8925f4ee
No related branches found
No related tags found
No related merge requests found
......@@ -42,7 +42,7 @@ GCCVER := $(shell printf "%02d%02d" $(GCCMAJOR) $(GCCMINOR))
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
......
.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)
......@@ -11,7 +11,7 @@ Requires: readline sqlite js curl
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 @@ make DESTDIR=$RPM_BUILD_ROOT prefix=/usr libdir="%{_libdir}" install
# 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 @@ fi
%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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment