Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 689124 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-7 / +15 lines)
Line  Link Here
0
-- games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
0
++ games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
Lines 18-24 Link Here
18
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
18
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
19
SLOT="0"
19
SLOT="0"
20
KEYWORDS="~amd64 ~x86"
20
KEYWORDS="~amd64 ~x86"
21
IUSE="editor +lobby nvtt pch test"
21
IUSE="editor +lobby nvtt pch system-mozjs test"
22
RESTRICT="test"
22
RESTRICT="test"
23
23
24
RDEPEND="
24
RDEPEND="
Lines 42-48 Link Here
42
	x11-libs/libXcursor
42
	x11-libs/libXcursor
43
	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
43
	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
44
	lobby? ( >=net-libs/gloox-1.0.20 )
44
	lobby? ( >=net-libs/gloox-1.0.20 )
45
	nvtt? ( media-gfx/nvidia-texture-tools )"
45
	nvtt? ( media-gfx/nvidia-texture-tools )
46
	system-mozjs? ( dev-lang/spidermonkey:38 )"
46
DEPEND="${RDEPEND}
47
DEPEND="${RDEPEND}
47
	${PYTHON_DEPS}
48
	${PYTHON_DEPS}
48
	virtual/pkgconfig
49
	virtual/pkgconfig
Lines 69-74 Link Here
69
		$(usex test "" "--without-tests")
70
		$(usex test "" "--without-tests")
70
		$(usex editor "--atlas" "")
71
		$(usex editor "--atlas" "")
71
		$(usex lobby "" "--without-lobby")
72
		$(usex lobby "" "--without-lobby")
73
		$(usex system-mozjs "--with-system-mozjs38" "")
72
		--collada
74
		--collada
73
		--bindir="/usr/bin"
75
		--bindir="/usr/bin"
74
		--libdir="/usr/$(get_libdir)"/${PN}
76
		--libdir="/usr/$(get_libdir)"/${PN}
Lines 101-114 Link Here
101
	tc-export AR
103
	tc-export AR
102
104
103
	# build bundled and patched spidermonkey
105
	# build bundled and patched spidermonkey
104
	cd libraries/source/spidermonkey || die
106
	if [ ! use system-mozjs ]; then
105
	JOBS="${MAKEOPTS}" ./build.sh || die
107
		cd libraries/source/spidermonkey || die
106
	cd "${S}" || die
108
		JOBS="${MAKEOPTS}" ./build.sh || die
109
		cd "${S}" || die
110
	fi
107
111
108
	# build 3rd party fcollada
112
	# build 3rd party fcollada
109
	emake -C libraries/source/fcollada/src
113
	emake -C libraries/source/fcollada/src
110
114
111
	# build 0ad
115
	# build 0ad
116
	if [ ! use system-mozjs ]; then
117
		CFLAGS="${CFLAGS} -I/usr/include/mozjs-38/"
118
		CXXFLAGS="${CXXFLAGS} -I/usr/include/mozjs-38/"
119
	fi
112
	emake -C build/workspaces/gcc verbose=1
120
	emake -C build/workspaces/gcc verbose=1
113
}
121
}
114
122
Lines 126-132 Link Here
126
134
127
	exeinto /usr/$(get_libdir)/${PN}
135
	exeinto /usr/$(get_libdir)/${PN}
128
	doexe binaries/system/libCollada.so
136
	doexe binaries/system/libCollada.so
129
	doexe libraries/source/spidermonkey/lib/*.so
137
	! use system-mozjs && doexe libraries/source/spidermonkey/lib/*.so
130
	use editor && doexe binaries/system/libAtlasUI.so
138
	use editor && doexe binaries/system/libAtlasUI.so
131
139
132
	dodoc binaries/system/readme.txt
140
	dodoc binaries/system/readme.txt

Return to bug 689124