Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 581740 Details for
Bug 689124
games-strategy/0ad-0.0.23b_alpha: allow using system library dev-lang/spidermonkey:38
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
0ad-system_mozjs.patch
0ad.ebuild.patch (text/plain), 1.74 KB, created by
Samuel Bauer
on 2019-07-02 01:16:46 UTC
(
hide
)
Description:
0ad-system_mozjs.patch
Filename:
MIME Type:
Creator:
Samuel Bauer
Created:
2019-07-02 01:16:46 UTC
Size:
1.74 KB
patch
obsolete
>--- games-strategy/0ad/0ad-0.0.23b_alpha.ebuild >+++ games-strategy/0ad/0ad-0.0.23b_alpha.ebuild >@@ -18,7 +18,7 @@ > LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB" > SLOT="0" > KEYWORDS="~amd64 ~x86" >-IUSE="editor +lobby nvtt pch test" >+IUSE="editor +lobby nvtt pch system-mozjs test" > RESTRICT="test" > > RDEPEND=" >@@ -42,7 +42,8 @@ > x11-libs/libXcursor > editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) > lobby? ( >=net-libs/gloox-1.0.20 ) >- nvtt? ( media-gfx/nvidia-texture-tools )" >+ nvtt? ( media-gfx/nvidia-texture-tools ) >+ system-mozjs? ( dev-lang/spidermonkey:38 )" > DEPEND="${RDEPEND} > ${PYTHON_DEPS} > virtual/pkgconfig >@@ -69,6 +70,7 @@ > $(usex test "" "--without-tests") > $(usex editor "--atlas" "") > $(usex lobby "" "--without-lobby") >+ $(usex system-mozjs "--with-system-mozjs38" "") > --collada > --bindir="/usr/bin" > --libdir="/usr/$(get_libdir)"/${PN} >@@ -101,14 +103,20 @@ > tc-export AR > > # build bundled and patched spidermonkey >- cd libraries/source/spidermonkey || die >- JOBS="${MAKEOPTS}" ./build.sh || die >- cd "${S}" || die >+ if [ ! use system-mozjs ]; then >+ cd libraries/source/spidermonkey || die >+ JOBS="${MAKEOPTS}" ./build.sh || die >+ cd "${S}" || die >+ fi > > # build 3rd party fcollada > emake -C libraries/source/fcollada/src > > # build 0ad >+ if [ ! use system-mozjs ]; then >+ CFLAGS="${CFLAGS} -I/usr/include/mozjs-38/" >+ CXXFLAGS="${CXXFLAGS} -I/usr/include/mozjs-38/" >+ fi > emake -C build/workspaces/gcc verbose=1 > } > >@@ -126,7 +134,7 @@ > > exeinto /usr/$(get_libdir)/${PN} > doexe binaries/system/libCollada.so >- doexe libraries/source/spidermonkey/lib/*.so >+ ! use system-mozjs && doexe libraries/source/spidermonkey/lib/*.so > use editor && doexe binaries/system/libAtlasUI.so > > dodoc binaries/system/readme.txt
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 689124
: 581740 |
581742