summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2017-10-03 16:50:53 -0400
committerIan Stakenvicius <axs@gentoo.org>2017-10-03 16:51:22 -0400
commiteff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1 (patch)
tree5c3a5864457f624d54ea7610c25533fc998eddf2 /dev-lang/spidermonkey/files
parentdev-lang/spidermonkey: work around bad include directory (diff)
downloadgentoo-eff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1.tar.gz
gentoo-eff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1.tar.bz2
gentoo-eff1f89fa6cddd59b6b8b7f668ba9c629ad27ec1.zip
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
Diffstat (limited to 'dev-lang/spidermonkey/files')
-rw-r--r--dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch22
1 files changed, 22 insertions, 0 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