Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lang/spidermonkey/
Date: Tue, 28 Feb 2017 19:10:14
Message-Id: 1488309003.ecab2ae7933ec853caf83b6bd449199750e1e3d9.axs@gentoo
1 commit: ecab2ae7933ec853caf83b6bd449199750e1e3d9
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 19:09:15 2017 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 19:10:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecab2ae7
7
8 dev-lang/spidermonkey:45 - hack to force copy instead of symlink
9
10 This commit implements a bad hack that overrides the build system's
11 determination that headers should be installed as symlinks by sed'ing a
12 buildsystem-generated file after configure completes. It's not ideal
13 but it will allow the package to be unmasked.
14
15 Package-Manager: portage-2.3.3
16
17 dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild | 6 ++++++
18 profiles/package.mask | 5 -----
19 2 files changed, 6 insertions(+), 5 deletions(-)
20
21 diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
22 index 5eb8463c60..aa14536766 100644
23 --- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
24 +++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
25 @@ -72,6 +72,12 @@ src_configure() {
26 $(use_enable jit ion) \
27 $(use_enable static-libs static) \
28 $(use_enable test tests)
29 +
30 + # An unfortunate hack to undo header install symlinking, but
31 + # necessary until the function that generates this file can be
32 + # determined and fixed
33 + sed -i -e 's/^1/2/' \
34 + "${BUILDDIR}"/_build_manifests/install/dist_include || die
35 }
36
37 cross_make() {
38
39 diff --git a/profiles/package.mask b/profiles/package.mask
40 index 7189e77509..de5db9debb 100644
41 --- a/profiles/package.mask
42 +++ b/profiles/package.mask
43 @@ -30,11 +30,6 @@
44
45 #--- END OF EXAMPLES ---
46
47 -# Ian Stakenvicius <axs@g.o> (28 Feb 2017)
48 -# Installs symlinks to ${S} instead of copies of files,
49 -# will unmask once fixed
50 -dev-lang/spidermonkey:45
51 -
52 # Matt Turner <mattst88@g.o> (26 Feb 2017)
53 # Integrated into xorg-server since 1.17. Removal in 30 days.
54 # Bug #611058