forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
1 parent
add57df
commit eff1f89
Showing
2 changed files
with
23 additions
and
3 deletions.
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters