Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stuart John Watson
mw
Commits
807f6ede
Commit
807f6ede
authored
10 years ago
by
Justin Mitchell
Browse files
Options
Downloads
Patches
Plain Diff
Try to fix rpm builds
parent
8925f4ee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.common
+1
-1
1 addition, 1 deletion
Makefile.common
mozjs17.0.0/Makefile
+5
-2
5 additions, 2 deletions
mozjs17.0.0/Makefile
mw.spec
+3
-1
3 additions, 1 deletion
mw.spec
with
9 additions
and
4 deletions
Makefile.common
+
1
−
1
View file @
807f6ede
...
...
@@ -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
)
/
$(
lib
dir
)
/
JSLIBS
=
-lmozjs-17
.0
JSSCRIPTTYPE
=
JSScript
endif
...
...
This diff is collapsed.
Click to expand it.
mozjs17.0.0/Makefile
+
5
−
2
View file @
807f6ede
.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
)
This diff is collapsed.
Click to expand it.
mw.spec
+
3
−
1
View file @
807f6ede
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment