From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 895E01396D0 for ; Tue, 3 Oct 2017 20:51:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2B602BC003; Tue, 3 Oct 2017 20:51:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 940252BC003 for ; Tue, 3 Oct 2017 20:51:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FCA7341745 for ; Tue, 3 Oct 2017 20:51:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 231DC9092 for ; Tue, 3 Oct 2017 20:51:32 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1507063882.eff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild X-VCS-Directories: dev-lang/spidermonkey/ dev-lang/spidermonkey/files/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: eff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1 X-VCS-Branch: master Date: Tue, 3 Oct 2017 20:51:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 30a58f13-fff5-4b9b-85bd-3f35565f1d89 X-Archives-Hash: 2b9acadc4b7b6454f8ee78f8c270734d commit: eff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1 Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Oct 3 20:50:53 2017 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Oct 3 20:51:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff1f89f dev-lang/spidermonkey: fix includedir install path on 52.4.0 Restored upstream config/baseconfig.mk to undo something that was applied agaist firefox-52.4.0esr. Closes: http://bugs.gentoo.org/630506 Package-Manager: Portage-2.3.8, Repoman-2.3.1 .../files/spidermonkey-52-baseconfig.patch | 22 ++++++++++++++++++++++ .../spidermonkey-52.4.0_pre20171003-r1.ebuild | 4 +--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch b/dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch new file mode 100644 index 00000000000..ee52728fa95 --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch @@ -0,0 +1,22 @@ +Fix various paths to include MOZ_APP_VERSION + +This has been committed upstream but was not included in +the 52.4.0 sources that spidermonkey was rolled from. + +--- a/config/baseconfig.mk 2017-10-03 14:00:45.000000000 -0400 ++++ b/config/baseconfig.mk 2017-10-03 16:36:10.857663794 -0400 +@@ -2,10 +2,10 @@ + # directly in python/mozbuild/mozbuild/base.py for gmake validation. + # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending + # whether a normal build is happening or whether the check is running. +-includedir := $(includedir)/$(MOZ_APP_NAME) +-idldir = $(includedir)/idl/$(MOZ_APP_NAME) +-installdir = $(libdir)/$(MOZ_APP_NAME) +-sdkdir = $(libdir)/$(MOZ_APP_NAME) ++includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = $(includedir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + ifeq (.,$(DEPTH)) + DIST = dist + else diff --git a/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild index 35d95d63acc..7c80ac01c86 100644 --- a/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild @@ -44,6 +44,7 @@ src_prepare() { || die eapply "${WORKDIR}/${PN}" + eapply "${FILESDIR}"/${PN}-52-baseconfig.patch eapply_user @@ -130,9 +131,6 @@ src_install() { cd "${BUILDDIR}" || die emake DESTDIR="${D}" install - #work around bad header installation - mv "${ED}"usr/include/mozjs{,-52} || die - if ! use minimal; then if use jit; then pax-mark m "${ED}"usr/bin/js${SLOT}